Base V3.2.0

- Fixed .container-full for mobile, tablet, desktop and HD devices - Version bump for style.scss, package.json and bower.json
getbase · Sep 7, 2016 · 53b853c · 53b853c
1 parent 7f0fc02
commit 53b853c
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 119 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "base",
-  "version": "3.1.5",
+  "version": "3.2.0",
   "homepage": "http://matthewhartman.github.io/base/",
   "authors": [
     "Matthew Hartman <[email protected]>"

diff --git a/changelog.markdown b/changelog.markdown
@@ -1,6 +1,12 @@
 # Base 2 Change Log
 
 
+## [3.2.0] - 2016-09-07
+### Base V3.2.0
+- Fixed .container-full for mobile, tablet, desktop and HD devices
+- Version bump for style.scss, package.json and bower.json
+
+
 ## [3.1.5] - 2016-07-02
 ### Base V3.1.5
 - Fixed IE bug with placeholder color override

diff --git a/dist/css/styles.css b/dist/css/styles.css
diff --git a/dist/css/styles.css.map b/dist/css/styles.css.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "getbase",
-  "version": "3.1.5",
+  "version": "3.2.0",
   "description": "A Rock Solid, Responsive HTML/CSS Framework built to work on all devices big and small.",
   "homepage": "http://getbase.org/",
   "scripts": {

diff --git a/src/css/styles.css b/src/css/styles.css
diff --git a/src/css/styles.css.map b/src/css/styles.css.map
diff --git a/src/scss/base.scss b/src/scss/base.scss
@@ -2,7 +2,7 @@
 
 // Base Stylesheet - http://getbase.org
 // Author: Matthew Hartman - http://www.matthewhartman.com.au/
-// Version: 3.1.5 - Last Updated: July 02, 2016
+// Version: 3.2.0 - Last Updated: September 07, 2016
 
 ========================================================================== */
 

diff --git a/src/scss/base/_grid-non-responsive.scss b/src/scss/base/_grid-non-responsive.scss
@@ -13,18 +13,14 @@
 }
 
 // Mobile Container
-.container {
+.container, .container-full {
   padding-left: $grid-gutter;
   padding-right: $grid-gutter;
   margin-left: auto;
   margin-right: auto;
-  width: $container-desktop;
 }
-.container-full {
-  padding-left: 0;
-  padding-right: 0;
-  margin-left: auto;
-  margin-right: auto;
+.container {
+  width: $container-desktop;
 }
 
 // Grid Columns - Global Rules

diff --git a/src/scss/base/_grid.scss b/src/scss/base/_grid.scss
@@ -44,76 +44,56 @@
 }
 
 // Container
-.container {
+.container, .container-full {
   padding-left: $grid-gutter;
   padding-right: $grid-gutter;
   margin-left: auto;
   margin-right: auto;
 }
-.container-full {
-  padding-left: 0;
-  padding-right: 0;
-  margin-left: auto;
-  margin-right: auto;
-}
+
 // Medium Device Container
 @include breakpoint(m) {
-  .container, .container-full {
+  .container {
     width: $container-m;
   }
-  .container-m {
-    width: $container-m;
-    padding-left: $grid-gutter-m;
-    padding-right: $grid-gutter-m;
+  .container-m, .container-full-m {
+    padding-left: $grid-gutter;
+    padding-right: $grid-gutter;
     margin-left: auto;
     margin-right: auto;
   }
-  .container-full-m {
+  .container-m {
     width: $container-m;
-    margin-left: auto;
-    margin-right: auto;
-    padding-left: 0;
-    padding-right: 0;
   }
 }
 // Large Device Container
 @include breakpoint(l) {
-  .container, .container-full {
+  .container {
     width: $container-l;
   }
-  .container-l {
-    width: $container-l;
-    padding-left: $grid-gutter-l;
-    padding-right: $grid-gutter-l;
+  .container-l, .container-full-l {
+    padding-left: $grid-gutter;
+    padding-right: $grid-gutter;
     margin-left: auto;
     margin-right: auto;
   }
-  .container-full-l {
+  .container-l {
     width: $container-l;
-    margin-left: auto;
-    margin-right: auto;
-    padding-left: 0;
-    padding-right: 0;
   }
 }
 // Extra Large Device Container
 @include breakpoint(xl) {
-  .container, .container-full {
+  .container {
     width: $container-xl;
   }
-  .container-xl {
-    width: $container-xl;
-    padding-left: $grid-gutter-xl;
-    padding-right: $grid-gutter-xl;
+  .container-xl, .container-full-xl {
+    padding-left: $grid-gutter;
+    padding-right: $grid-gutter;
     margin-left: auto;
     margin-right: auto;
   }
-  .container-full-xl {
+  .container-xl {
     width: $container-xl;
-    margin-left: auto;
-    margin-right: auto;
-    padding-left: 0;
-    padding-right: 0;
   }
 }