_grid.scss in zurb-foundation-3.2.4.rc1

- old
+ new

@@ -41,12 +41,12 @@
   @for $i from 2 through $totalColumns - 2 {
     .push-#{convert-number-to-word($i)} { #{$defaultFloat}: gridCalc($i, $totalColumns); }
     .pull-#{convert-number-to-word($i)} { #{$defaultOpposite}: gridCalc($i, $totalColumns); }
   }
 
-  img, object, embed { max-width: 100%; height: auto; }
-  object, embed { height: 100%; }
+  img { height: auto; }
+  img, object, embed { max-width: 100%; }
   img { -ms-interpolation-mode: bicubic; }
   #map_canvas img, .map_canvas img {max-width: none!important;}
 
   /* Nicolas Gallagher's micro clearfix */
   .row { @include clearfix(); }
@@ -69,19 +69,19 @@
     &>li { display: block; height: auto; float: $defaultFloat; }
 
     @for $i from 1 through $blockGridElements {
       &.#{convert-number-to-word($i)}-up {
         @if $i == 1 { margin: 0; }
-        @if $i == 2 { margin: 0 -15px; }
-        @if $i == 3 { margin: 0 -12px; }
-        @if $i == 4 { margin: 0 -10px; }
+        @else if $i == 2 { margin: 0 -15px; }
+        @else if $i == 3 { margin: 0 -12px; }
+        @else if $i == 4 { margin: 0 -10px; }
         @else { margin: 0 -8px; }
         &>li {
           width: 100%/$i;
           @if $i == 1 { padding: 0 0 15px; }
-          @if $i == 2 { padding: 0 15px 15px; }
-          @if $i == 3 { padding: 0 12px 12px; }
-          @if $i == 4 { padding: 0 10px 10px; }
+          @else if $i == 2 { padding: 0 15px 15px; }
+          @else if $i == 3 { padding: 0 12px 12px; }
+          @else if $i == 4 { padding: 0 10px 10px; }
           @else { padding: 0 8px 8px; }
           @if $i > 1 { &:nth-child(#{$i}n+1) { clear: both; } }
         }
       }
     }