neat-compass 1.0.2 → 1.1.0

data/stylesheets/neat/_neat.scss

@@ -1,6 +1,6 @@
-// Bourbon Neat 1.0.1
+// Bourbon Neat
 // MIT Licensed
-// Copyright (c) 2011 thoughtbot, inc.
+// Copyright (c) 2012-2013 thoughtbot, inc.
 
 // Helpers
 @import "neat-helpers";
@@ -8,4 +8,5 @@
 // Grid
 @import "grid/global-variables";
 @import "grid/grid";
+@import "grid/omega";
 @import "grid/visual-grid";

data/stylesheets/neat/functions/_private.scss

@@ -18,6 +18,15 @@
   @return false;
 }
 
+// Contains display value
+@function contains-display-value($query) {
+  @if belongs-to(table, $query) or belongs-to(block, $query) or belongs-to(inline-block, $query) or belongs-to(inline, $query) {
+    @return true;
+  }
+
+  @return false;
+}
+
 // Parses the first argument of span-columns()
 @function container-span($span: $span) {
   @if length($span) == 3 {

data/stylesheets/neat/grid/_grid.scss

@@ -39,7 +39,7 @@ $fg-max-width: $max-width;
     width: flex-grid($columns, $container-columns) + flex-gutter($container-columns);
 
     &:last-child {
-      padding-right: 0;
+      width: flex-grid($columns, $container-columns);
     }
   }
 
@@ -85,32 +85,12 @@ $fg-max-width: $max-width;
 
 // Pad
 @mixin pad($padding: flex-gutter()) {
-  padding: $padding;
-}
-
-// Remove element gutter
-@mixin omega($display: block, $direction: right) {
-  @if $display == table {
-    padding-#{$direction}: 0;
-  }
-
-  @else {
-    margin-#{$direction}: 0;
-  }
-}
-
-@mixin nth-omega($nth, $display: block, $direction: right) {
-  @if $display == table {
-    &:nth-child(#{$nth}) {
-      padding-#{$direction}: 0;
-    }
-  }
-
-  @else {
-    &:nth-child(#{$nth}) {
-      margin-#{$direction}: 0;
-    }
+  $padding-list: null;
+  @each $value in $padding {
+    $value: if($value == 'default', flex-gutter(), $value);
+    $padding-list: join($padding-list, $value);
   }
+  padding: $padding-list;
 }
 
 // Fill 100% of parent

data/stylesheets/neat/grid/_omega.scss

@@ -0,0 +1,68 @@
+// Remove last element gutter
+@mixin omega($query: block, $direction: right) {
+  $table: if(belongs-to(table, $query), true, false);
+  $auto: if(belongs-to(auto, $query), true, false);
+
+  @if length($query) == 1 {
+    @if $auto {
+      &:last-child {
+        margin-#{$direction}: 0;
+      }
+    }
+
+    @else if contains-display-value($query) {
+      @if $table {
+        padding-#{$direction}: 0;
+      }
+
+      @else {
+        margin-#{$direction}: 0;
+      }
+    }
+
+    @else {
+      &:nth-child(#{$query}) {
+        margin-#{$direction}: 0;
+      }
+    }
+  }
+
+  @else if length($query) == 2 {
+    @if $table {
+      @if $auto {
+        &:last-child {
+          padding-#{$direction}: 0;
+        }
+      }
+
+      @else {
+        &:nth-child(#{nth($query, 1)}) {
+          padding-#{$direction}: 0;
+        }
+      }
+    }
+
+    @else {
+      @if $auto {
+        &:last-child {
+          margin-#{$direction}: 0;
+        }
+      }
+
+      @else {
+        &:nth-child(#{nth($query, 1)}) {
+          margin-#{$direction}: 0;
+        }
+      }
+    }
+  }
+
+  @else {
+    @warn "Too many arguments passed to the omega() mixin."
+  }
+}
+
+@mixin nth-omega($nth, $display: block, $direction: right) {
+  @warn "The nth-omega() mixin is deprecated. Please use omega() instead.";
+  @include omega($nth $display, $direction);
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neat-compass
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
@@ -73,6 +73,7 @@ files:
 - stylesheets/neat/functions/_px-to-em.scss
 - stylesheets/neat/grid/_global-variables.scss
 - stylesheets/neat/grid/_grid.scss
+- stylesheets/neat/grid/_omega.scss
 - stylesheets/neat/grid/_visual-grid.scss
 - stylesheets/neat/settings/_grid.scss
 - stylesheets/neat/settings/_visual-grid.scss