From 6cc5ab0a2fe606e87be8c8fe7f60b5ba5964bbd5 Mon Sep 17 00:00:00 2001
From: zurbchris <chris@zurb.com>
Date: Thu, 14 Mar 2013 22:13:25 -0700
Subject: [PATCH] updated grid float variables

---
 scss/foundation/components/_grid.scss | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/scss/foundation/components/_grid.scss b/scss/foundation/components/_grid.scss
index 3fc7db8b1..a094b9f83 100644
--- a/scss/foundation/components/_grid.scss
+++ b/scss/foundation/components/_grid.scss
@@ -53,7 +53,7 @@ $total-columns: 12 !default;
 
 
 // For creating columns - @include these inside a media query to control small vs. large grid layouts
-@mixin grid-column($columns:false, $last-column:false, $center:false, $offset:false, $push:false, $pull:false, $collapse:false, $float:false) {
+@mixin grid-column($columns:false, $last-column:false, $center:false, $offset:false, $push:false, $pull:false, $collapse:false, $float:left) {
 
   position: relative;
 
@@ -91,7 +91,7 @@ $total-columns: 12 !default;
   }
 
   @if $float {
-    @if $float == left { float: $default-float; }
+    @if $float == left or true { float: $default-float; }
     @else if $float == right { float: $default-opposite; }
     @else { float: none; }
   }
@@ -121,37 +121,37 @@ $total-columns: 12 !default;
   @media only screen {
 
     .row .column,
-    .row .columns { @include grid-column($columns:false, $float:left); }
+    .row .columns { @include grid-column($columns:false); }
 
     @for $i from 1 through $total-columns {
-      .row .small#{-$i} { @include grid-column($columns:$i,$collapse:null); }
+      .row .small#{-$i} { @include grid-column($columns:$i,$collapse:null,$float:false); }
     }
 
     @for $i from 1 through $total-columns - 2 {
-      .row .small-offset-#{$i} { @include grid-column($offset:$i, $collapse:null); }
+      .row .small-offset-#{$i} { @include grid-column($offset:$i, $collapse:null,$float:false); }
     }
 
     [class*="column"] + [class*="column"]:last-child { float: $default-opposite; }
     [class*="column"] + [class*="column"].end { float: $default-float; }
 
     .column.small-centered,
-    .columns.small-centered { @include grid-column($center:true, $collapse:null, $float:none); }
+    .columns.small-centered { @include grid-column($center:true, $collapse:null, $float:false); }
   }
 
   /* Styles for screens that are atleast 768px; */
   @media #{$small} {
 
     @for $i from 1 through $total-columns {
-      .row .large#{-$i} { @include grid-column($columns:$i,$collapse:null); }
+      .row .large#{-$i} { @include grid-column($columns:$i,$collapse:null,$float:false); }
     }
 
     @for $i from 1 through $total-columns - 2 {
-      .row .large-offset-#{$i} { @include grid-column($offset:$i, $collapse:null); }
+      .row .large-offset-#{$i} { @include grid-column($offset:$i, $collapse:null,$float:false); }
     }
 
     @for $i from 2 through $total-columns - 2 {
-      .push#{-$i} { @include grid-column($push:$i, $collapse:null); }
-      .pull#{-$i} { @include grid-column($pull:$i, $collapse:null); }
+      .push#{-$i} { @include grid-column($push:$i, $collapse:null, $float:false); }
+      .pull#{-$i} { @include grid-column($pull:$i, $collapse:null, $float:false); }
     }
 
     @for $i from 2 through $total-columns - 2 {
@@ -160,7 +160,7 @@ $total-columns: 12 !default;
     }
 
     .column.large-centered,
-    .columns.large-centered { @include grid-column($center:true, $collapse:null, $float:none); }
+    .columns.large-centered { @include grid-column($center:true, $collapse:null, $float:false); }
 
   }
 
-- 
2.47.3