fix floating element clearing

herereadthis · Jun 20, 2015 · 15dab93 · 15dab93
1 parent c8158cf
commit 15dab93
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -220,7 +220,7 @@ module.exports = function (grunt) {
                     precision: 4
                 },
                 files: {
-                    '<%= config.dist %>/css/main.sass-minified.css': '<%= config.src %>/sass/main.scss'
+                    '<%= config.dist %>/css/main.sass-minified.css': '<%= config.src %>/sass/bellmaker.scss'
                 }
             },
             uncompressedSass: {
@@ -229,7 +229,7 @@ module.exports = function (grunt) {
                     precision: 4
                 },
                 files: {
-                    '<%= config.dist %>/css/main.sass.css': '<%= config.src %>/sass/main.scss'
+                    '<%= config.dist %>/css/main.sass.css': '<%= config.src %>/sass/bellmaker.scss'
                 }
             }
         },

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "bellmaker",
-  "version": "0.4.14",
+  "version": "0.4.15",
   "authors": [
     {
       "name": "Jimmy Ha",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bellmaker",
-  "version": "0.4.14",
+  "version": "0.4.15",
   "description": "Responsive CSS media query library for LESS and SASS, with device-agnostic and device-specific breakpoints",
   "repository": {
     "type": "git",

diff --git a/src/less/page_layout.less b/src/less/page_layout.less
@@ -3,7 +3,15 @@
 .bellmaker_container {
     margin-right: auto;
     margin-left: auto;
-
+
+    // If the container contains floating elements, this ensures that the
+    // container will expand vertically to hold all elements.
+    &:after {
+        content: "";
+        float: none;
+        clear: both;
+        display: block;
+    }
     @media @da_baseline {
         width: @pw_baseline;
     }

diff --git a/src/sass/_page_layout.scss b/src/sass/_page_layout.scss
@@ -4,6 +4,14 @@
     margin-right: auto;
     margin-left: auto;
 
+    // If the container contains floating elements, this ensures that the
+    // container will expand vertically to hold all elements.
+    &:after {
+        content: "";
+        float: none;
+        clear: both;
+        display: block;
+    }
     @media #{$da_baseline} {
         width: $pw_baseline;
     }