neat-compass 1.4.0 → 1.5.0.pre

data/stylesheets/neat/_neat-helpers.scss

@@ -1,7 +1,6 @@
 // Functions
 @import "functions/private";
 @import "functions/new-breakpoint";
-@import "functions/px-to-em";
 
 // Settings
 @import "settings/grid";

data/stylesheets/neat/functions/_private.scss

@@ -44,6 +44,24 @@
   }
 }
 
+@function container-shift($shift: $shift) {
+  $parent-columns: $grid-columns !default;
+
+  @if length($shift) == 3 {
+    $container-columns: nth($shift, 3);
+    @return $container-columns;
+  }
+
+  @else if length($shift) == 2 {
+    $container-columns: nth($shift, 2);
+    @return $container-columns;
+  }
+
+  @else {
+    @return $parent-columns;
+  }
+}
+
 // Generates a striped background
 @function gradient-stops($grid-columns, $color: $visual-grid-color) {
   $transparent: rgba(0,0,0,0);

data/stylesheets/neat/grid/_shift.scss

@@ -1,4 +1,11 @@
 @mixin shift($n-columns: 1) {
+  @include shift-in-context($n-columns);
+}
+
+@mixin shift-in-context($shift: $columns of $container-columns) {
+  $n-columns: nth($shift, 1);
+  $parent-columns: container-shift($shift);
+
   $direction: get-direction($layout-direction, $default-layout-direction);
   $opposite-direction: get-opposite-direction($direction);
 

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

@@ -16,10 +16,17 @@
     padding-#{$direction}: $padding;
     width: flex-grid($columns, $container-columns) + $padding;
   } @else {
-    display: block;
     float: #{$opposite-direction};
 
+    @if $display != no-display {
+      display: block;
+    }
+
     @if $display == collapse {
+      @warn "The 'collapse' argument will be deprecated. Use 'block-collapse' instead."
+    }
+
+    @if $display == collapse or $display == block-collapse {
       width: flex-grid($columns, $container-columns) + flex-gutter($container-columns);
 
       &:last-child {

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: neat-compass
 version: !ruby/object:Gem::Version
-  version: 1.4.0
-  prerelease: 
+  version: 1.5.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Jed Foster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
@@ -70,7 +70,6 @@ files:
 - stylesheets/neat/_neat.scss
 - stylesheets/neat/functions/_new-breakpoint.scss
 - stylesheets/neat/functions/_private.scss
-- stylesheets/neat/functions/_px-to-em.scss
 - stylesheets/neat/grid/_fill-parent.scss
 - stylesheets/neat/grid/_grid.scss
 - stylesheets/neat/grid/_media.scss
@@ -101,9 +100,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/stylesheets/neat/functions/_px-to-em.scss

@@ -1,3 +0,0 @@
-@function em($pxval, $base: 16) {
-  @return ($pxval / $base) * 1em;
-}