neat-compass 1.5.0 → 1.5.1

data/stylesheets/neat/_neat.scss

@@ -1,4 +1,4 @@
-// Bourbon Neat 1.5.0
+// Bourbon Neat 1.5.1
 // MIT Licensed
 // Copyright (c) 2012-2013 thoughtbot, inc.
 

data/stylesheets/neat/functions/_new-breakpoint.scss

@@ -4,7 +4,7 @@
     $query: $default-feature nth($query, 1) $total-columns;
   }
 
-  @else if length($query) == 2 or length($query) == 4 {
+  @else if length($query) % 2 == 0 {
     $query: append($query, $total-columns);
   }
 

data/stylesheets/neat/functions/_private.scss

@@ -45,7 +45,7 @@
 }
 
 @function container-shift($shift: $shift) {
-  $parent-columns: $grid-columns !default;
+  $parent-columns: $grid-columns  !default;
 
   @if length($shift) == 3 {
     $container-columns: nth($shift, 3);

data/stylesheets/neat/grid/_media.scss

@@ -1,5 +1,4 @@
 @mixin media($query:$feature $value $columns, $total-columns: $grid-columns) {
-
   @if length($query) == 1 {
     @media screen and ($default-feature: nth($query, 1)) {
       $default-grid-columns: $grid-columns;
@@ -9,43 +8,31 @@
     }
   }
 
-  @else if length($query) == 2 {
-    @media screen and (nth($query, 1): nth($query, 2)) {
-      $default-grid-columns: $grid-columns;
-      $grid-columns: $total-columns;
-      @content;
-      $grid-columns: $default-grid-columns;
-    }
-  }
+  @else {
+    $loopTo: length($query);
+    $mediaQuery: 'screen and ';
+    $default-grid-columns: $grid-columns;
+    $grid-columns: $total-columns;
 
-  @else if length($query) == 3 {
-    @media screen and (nth($query, 1): nth($query, 2)) {
-      $default-grid-columns: $grid-columns;
-      $grid-columns: nth($query, 3);
-      @content;
-      $grid-columns: $default-grid-columns;
+    @if length($query) % 2 != 0 {
+      $grid-columns: nth($query, $loopTo);
+      $loopTo: $loopTo - 1;
     }
-  }
 
-  @else if length($query) == 4 {
-    @media screen and (nth($query, 1): nth($query, 2)) and (nth($query, 3): nth($query, 4)) {
-      $default-grid-columns: $grid-columns;
-      $grid-columns: $total-columns;
-      @content;
-      $grid-columns: $default-grid-columns;
+    $i: 1;
+    @while $i <= $loopTo {
+      $mediaQuery: $mediaQuery + '(' + nth($query, $i) + ': ' + nth($query, $i + 1) + ') ';
+
+      @if ($i + 1) != $loopTo {
+        $mediaQuery: $mediaQuery + 'and ';
+      }
+
+      $i: $i + 2;
     }
-  }
 
-  @else if length($query) == 5 {
-    @media screen and (nth($query, 1): nth($query, 2)) and (nth($query, 3): nth($query, 4)) {
-      $default-grid-columns: $grid-columns;
-      $grid-columns: nth($query, 5);
+    @media #{$mediaQuery} {
       @content;
       $grid-columns: $default-grid-columns;
     }
   }
-
-  @else {
-    @warn "Wrong number of arguments for breakpoint(). Read the documentation for more details.";
-  }
 }

data/stylesheets/neat/grid/_omega.scss

@@ -9,6 +9,10 @@
     $direction: get-direction($layout-direction, $default-layout-direction);
   }
 
+  @if $table {
+    @warn "The omega mixin no longer removes padding in table layouts."
+  }
+
   @if length($query) == 1 {
     @if $auto {
       &:last-child {
@@ -16,14 +20,8 @@
       }
     }
 
-    @else if contains-display-value($query) {
-      @if $table {
-        padding-#{$direction}: 0;
-      }
-
-      @else {
-        margin-#{$direction}: 0;
-      }
+    @else if contains-display-value($query) and $table == false {
+      margin-#{$direction}: 0;
     }
 
     @else {
@@ -32,30 +30,14 @@
   }
 
   @else if length($query) == 2 {
-    @if $table {
-      @if $auto {
-        &:last-child {
-          padding-#{$direction}: 0;
-        }
-      }
-
-      @else {
-        &:nth-child(#{nth($query, 1)}) {
-          padding-#{$direction}: 0;
-        }
+    @if $auto {
+      &:last-child {
+        margin-#{$direction}: 0;
       }
     }
 
     @else {
-      @if $auto {
-        &:last-child {
-          margin-#{$direction}: 0;
-        }
-      }
-
-      @else {
-        @include nth-child(nth($query, 1), $direction);
-      }
+      @include nth-child(nth($query, 1), $direction);
     }
   }
 

data/stylesheets/neat/grid/_private.scss

@@ -41,10 +41,3 @@ $layout-direction: nil !default;
 
   @return $display-table;
 }
-
-@function get-padding-for-table-layout($columns, $total-columns) {
-  $total-padding: flex-gutter($total-columns) * ($columns - 1);
-  $padding: $total-padding / $columns;
-
-  @return $padding;
-}

data/stylesheets/neat/grid/_span-columns.scss

@@ -11,10 +11,8 @@
   $display-table: is-display-table($container-display-table, $display);
 
   @if $display-table  {
-    $padding: get-padding-for-table-layout($columns, $container-columns);
     display: table-cell;
-    padding-#{$direction}: $padding;
-    width: flex-grid($columns, $container-columns) + $padding;
+    width: percentage($columns / $container-columns);
   } @else {
     float: #{$opposite-direction};
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neat-compass
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass