neat 1.2.1 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5bdefb64cec2e270e681c122c86cb3c428b93ae3
+  data.tar.gz: 23f6315428bb85162b9ed54f7b96b95e16f659a6
+SHA512:
+  metadata.gz: 4f18d2d97a9b7ccb34366f6d6af3defacbcc1df94602f62c70db60ec26498636939e2d9a28fd7289b5906437b96d8712ced5ccf5d4c58a1d0e9c8b5fe20f4b69
+  data.tar.gz: 88ece79f10a6a0a72daabdce203ac49bf930706b5abf92afd087313468b8e41e6ed83ae3f6425ef2a47aace49bf87f866d7a839e78c35bd0c6c76843ede5ad5f

data/NEWS.md

@@ -1,3 +1,11 @@
+### 1.3.0 (2013-05-03)
+
+  * New: Add global RTL layout support
+  * New: Add row-specific RTL layout support
+  * New: Add auto-clearing for elements using `omega(nth-child)` (works only with simple nth-child arguments due to limited string operations in Sass)
+  * Fix: The visual grid no longer blocks user interactions
+  * Deprecate: `omega()` will no longer take `$direction` in favor of `row($direction)` or `$default-layout-direction`
+
 ### 1.2.1 (2013-04-04)
 
   * New: Add stylesheets path to Sass.load_paths

data/README.md

@@ -166,16 +166,13 @@ Browser support
 - IE 9+ (Visual grid is IE10 only)
 - IE 8 with [selectivizr](http://selectivizr.com) (no `media()` support)
 
-Documentation
+Links
 ===
 
 - [Online documentation](http://neat.bourbon.io/docs/)
 - [Docset feed](http://neat.bourbon.io/docset/Neat.xml) for Dash 1.8+ (Preferences **>** Downloads **>** + *Add Docset Feed*)
-
-Roadmap
-===
-
-The development roadmap can be tracked on this public [Trello board](http://bit.ly/neat-trello).
+- [Changelog](https://github.com/thoughtbot/neat/wiki/Changelog)
+- [Roadmap Trello board](http://bit.ly/neat-trello)
 
 Credits
 ===

data/app/assets/stylesheets/_neat.scss

@@ -6,7 +6,8 @@
 @import "neat-helpers";
 
 // Grid
-@import "grid/global-variables";
+@import "grid/private";
+@import "grid/reset";
 @import "grid/grid";
 @import "grid/omega";
 @import "grid/outer-container";

data/app/assets/stylesheets/functions/_private.scss

@@ -70,3 +70,38 @@
 
   @return $values;
 }
+
+// Layout direction
+@function get-direction($layout, $default) {
+  $direction: nil;
+  
+  @if $layout == LTR or $layout == RTL {
+    $direction: direction-from-layout($layout);
+  } @else {
+    $direction: direction-from-layout($default);
+  }
+
+  @return $direction;
+}
+
+@function direction-from-layout($layout) {
+  $direction: nil;
+
+  @if $layout == LTR {
+    $direction: right;
+  } @else {
+    $direction: left;
+  }
+
+  @return $direction;
+}
+
+@function get-opposite-direction($direction) {
+  $opposite-direction: left;
+
+  @if $direction == left {
+    $opposite-direction: right;
+  }
+
+  @return $opposite-direction;
+}

data/app/assets/stylesheets/grid/_omega.scss

@@ -1,8 +1,14 @@
 // Remove last element gutter
-@mixin omega($query: block, $direction: right) {
+@mixin omega($query: block, $direction: default) {
   $table: if(belongs-to(table, $query), true, false);
   $auto: if(belongs-to(auto, $query), true, false);
 
+  @if $direction != default {
+    @warn "The omega mixin will no longer take a $direction argument. To change the layout direction, use row($direction) or set $default-layout-direction instead."
+  } @else {
+    $direction: get-direction($layout-direction, $default-layout-direction);
+  }
+
   @if length($query) == 1 {
     @if $auto {
       &:last-child {
@@ -21,9 +27,7 @@
     }
 
     @else {
-      &:nth-child(#{$query}) {
-        margin-#{$direction}: 0;
-      }
+      @include nth-child($query, $direction);
     }
   }
 
@@ -50,9 +54,7 @@
       }
 
       @else {
-        &:nth-child(#{nth($query, 1)}) {
-          margin-#{$direction}: 0;
-        }
+        @include nth-child(nth($query, 1), $direction);
       }
     }
   }
@@ -62,7 +64,16 @@
   }
 }
 
-@mixin nth-omega($nth, $display: block, $direction: right) {
-  @warn "The nth-omega() mixin is deprecated. Please use omega() instead.";
-  @include omega($nth $display, $direction);
+@mixin nth-child($query, $direction) {
+  $opposite-direction: get-opposite-direction($direction);
+
+  &:nth-child(#{$query}) {
+    margin-#{$direction}: 0;
+  }
+
+  @if type-of($query) == number {
+    &:nth-child(#{$query}+1) {
+      clear: $opposite-direction;
+    }
+  }
 }

data/app/assets/stylesheets/grid/_private.scss

@@ -0,0 +1,21 @@
+$parent-columns: $grid-columns !default;
+$fg-column: $column;
+$fg-gutter: $gutter;
+$fg-max-columns: $grid-columns;
+$container-display-table: false !default;
+$layout-direction: nil !default;
+
+@function flex-grid($columns, $container-columns: $fg-max-columns) {
+  $width: $columns * $fg-column + ($columns - 1) * $fg-gutter;
+  $container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter;
+  @return percentage($width / $container-width);
+}
+
+@function flex-gutter($container-columns: $fg-max-columns, $gutter: $fg-gutter) {
+  $container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter;
+  @return percentage($gutter / $container-width);
+}
+
+@function grid-width($n) {
+  @return $n * $gw-column + ($n - 1) * $gw-gutter;
+}

data/app/assets/stylesheets/grid/_reset.scss

@@ -0,0 +1,12 @@
+@mixin reset-display {
+  $container-display-table: false;
+}
+
+@mixin reset-layout-direction {
+  $layout-direction: $default-layout-direction;
+}
+
+@mixin reset-all {
+  @include reset-display;
+  @include reset-layout-direction;
+}

data/app/assets/stylesheets/grid/_row.scss

@@ -1,5 +1,6 @@
-@mixin row($display: block) {
+@mixin row($display: block, $direction: $default-layout-direction) {
   @include clearfix;
+  $layout-direction: $direction;
 
   @if $display == table {
     display: table;
@@ -14,6 +15,3 @@
   }
 }
 
-@mixin reset-display {
-  $container-display-table: false;
-}

data/app/assets/stylesheets/grid/_shift.scss

@@ -1,5 +1,9 @@
 @mixin shift($n-columns: 1) {
-  margin-left: $n-columns * flex-grid(1, $parent-columns) + $n-columns * flex-gutter($parent-columns);
+
+  $direction: get-direction($layout-direction, $default-layout-direction);
+  $opposite-direction: get-opposite-direction($direction);
+
+  margin-#{$opposite-direction}: $n-columns * flex-grid(1, $parent-columns) + $n-columns * flex-gutter($parent-columns);
 
   // Reset nesting context
   $parent-columns: $grid-columns;

data/app/assets/stylesheets/grid/_span-columns.scss

@@ -4,55 +4,42 @@
   $container-columns: container-span($span);
   $display-table: false;
 
+  $direction: get-direction($layout-direction, $default-layout-direction);
+  $opposite-direction: get-opposite-direction($direction);
+
   @if $container-columns != $grid-columns {
     $parent-columns: $container-columns;
-  }
-
-  @else {
+  } @else {
     $parent-columns: $grid-columns;
   }
 
   @if $container-display-table == true {
     $display-table: true;
-  }
-
-  @else if $display == table {
+  } @else if $display == table {
     $display-table: true;
-  }
-
-  @else {
+  } @else {
     $display-table: false;
   }
 
   @if $display-table  {
     display: table-cell;
-    padding-right: flex-gutter($container-columns);
+    padding-#{$direction}: flex-gutter($container-columns);
     width: flex-grid($columns, $container-columns) + flex-gutter($container-columns);
 
     &:last-child {
       width: flex-grid($columns, $container-columns);
-      padding-right: 0;
-    }
-  }
-
-  @else if $display == inline-block {
-    @include inline-block;
-    margin-right: flex-gutter($container-columns);
-    width: flex-grid($columns, $container-columns);
-
-    &:last-child {
-      margin-right: 0;
+      padding-#{$direction}: 0;
     }
   }
 
   @else {
     display: block;
-    float: left;
-    margin-right: flex-gutter($container-columns);
+    float: #{$opposite-direction};
+    margin-#{$direction}: flex-gutter($container-columns);
     width: flex-grid($columns, $container-columns);
 
     &:last-child {
-      margin-right: 0;
+      margin-#{$direction}: 0;
     }
   }
 }

data/app/assets/stylesheets/grid/_to-deprecate.scss

@@ -50,3 +50,8 @@
     @warn "Wrong number of arguments for breakpoint(). Read the documentation for more details.";
   }
 }
+
+@mixin nth-omega($nth, $display: block, $direction: default) {
+  @warn "The nth-omega() mixin is deprecated. Please use omega() instead.";
+  @include omega($nth $display, $direction);
+}

data/app/assets/stylesheets/grid/_visual-grid.scss

@@ -20,6 +20,7 @@
     position: fixed;
     right: 0;
     width: 100%;
+    pointer-events: none;
 
     @if $visual-grid-index == back {
       z-index: -1;

data/app/assets/stylesheets/settings/_grid.scss

@@ -4,3 +4,4 @@ $grid-columns: 12 !default; // Total number of columns in the grid
 $max-width: em(1088) !default; // Max-width of the outer container
 $border-box-sizing: true !default; // Makes all elements have a border-box layout
 $default-feature: min-width; // Default @media feature for the breakpoint() mixin
+$default-layout-direction: LTR !default;

data/lib/neat/version.rb

@@ -1,3 +1,3 @@
 module Neat
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

data/neat.gemspec

@@ -30,4 +30,5 @@ Neat is an open source grid framework built on top of Bourbon with the aim of be
   s.add_development_dependency('rspec')
   s.add_development_dependency('rdoc')
   s.add_development_dependency('bundler')
+  s.add_development_dependency('rb-fsevent', '~> 0.9.1')
 end

data/spec/neat/columns_spec.rb

@@ -1,13 +1,11 @@
 require 'spec_helper'
 
 describe "@include span-columns()" do
-  let (:identifier) {"span-columns"}
-
   before(:all) do
-    ParserSupport.parse_file(identifier)
+    ParserSupport.parse_file("span-columns")
   end
 
-  context "with argument '6' in a twelve-column grid" do
+  context "with argument (6) in a twelve-column grid" do
     it "sets width in percentage" do
       expect('.span-columns-default').to have_rule('width: 48.82117%')
     end
@@ -39,7 +37,7 @@ describe "@include span-columns()" do
     end
   end
 
-  context "with argument 'table'" do
+  context "with argument (table)" do
     it "sets display to table-cell" do
       expect('.span-columns-table').to have_rule('display: table-cell')
     end
@@ -52,10 +50,4 @@ describe "@include span-columns()" do
       expect('.span-columns-table:last-child').to have_rule('width: 48.82117%')
     end
   end
-
-  context "with argument 'inline-block'" do
-    it "sets display to inline-block" do
-      expect('.span-columns-inline-block').to have_rule('display: inline-block')
-    end
-  end
 end

data/spec/neat/container_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper'
 
 describe "@include outer-container()" do
-  let (:identifier) {"outer-container"}
-
   before(:all) do
-    ParserSupport.parse_file(identifier)
+    ParserSupport.parse_file("outer-container")
   end
 
   it "adds clearfix" do

data/spec/neat/media_spec.rb

@@ -1,31 +1,29 @@
 require 'spec_helper'
 
 describe "@include media()" do
-  let (:identifier) {"media"}
-
   before(:all) do
-    ParserSupport.parse_file(identifier)
+    ParserSupport.parse_file("media")
   end
 
-  context "with argument '481px'" do
+  context "with argument (481px)" do
     it "outputs @media screen and (min-width: 481px)" do
       expect('.media-default').to be_contained_in('screen and (min-width: 481px)')
     end
   end
 
-  context "with argument 'max-width 480px'" do
+  context "with argument (max-width 480px)" do
     it "outputs @media screen and (max-width: 480px)" do
       expect('.media-max-width').to be_contained_in('screen and (max-width: 480px)')
     end
   end
 
-  context "with argument 'min-width 320px max-width 480px'" do
+  context "with argument (min-width 320px max-width 480px)" do
     it "outputs @media screen and (min-width: 320px) and (max-width: 480px)" do
       expect('.media-min-max-width').to be_contained_in('screen and (min-width: 320px) and (max-width: 480px)')
     end
   end
 
-  context "with argument '481px, 6'" do
+  context "with argument (481px, 6)" do
     it "outputs @media screen and (min-width: 481px)" do
       expect('.change-media-context').to be_contained_in('screen and (min-width: 481px)')
     end
@@ -35,7 +33,7 @@ describe "@include media()" do
     end
   end
 
-  context "with shorthand argument 'max-width 480px 6'" do
+  context "with shorthand argument (max-width 480px 6)" do
     it "outputs @media screen and (max-width: 480px)" do
       expect('.change-media-context-shorthand').to be_contained_in('screen and (max-width: 480px)')
     end

data/spec/neat/new_breakpoint_spec.rb

@@ -1,18 +1,16 @@
 require 'spec_helper'
 
 describe "new-breakpoint()" do
-  let (:identifier) {"new-breakpoint"}
-
   before(:all) do
-    ParserSupport.parse_file(identifier)
+    ParserSupport.parse_file("new-breakpoint")
   end
 
-  context "with argument 'max-width 768px 12'" do
+  context "with argument (max-width 768px 12)" do
     it "outputs (max-width 768px)" do
       expect('.responsive-element').to be_contained_in('screen and (max-width: 768px)')
     end
 
-    it "adds 'max-width 768px 12' to visual grid breakpoints" do
+    it "adds (max-width 768px 12) to visual grid breakpoints" do
       expect('$visual-grid-breakpoints').to have_value('max-width 768px 12')
     end
   end

data/spec/neat/omega_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper'
 
 describe "@include omega()" do
-  let (:identifier) {"omega"}
-
   before(:all) do
-    ParserSupport.parse_file(identifier)
+    ParserSupport.parse_file("omega")
   end
 
   context "with no argument" do
@@ -13,45 +11,57 @@ describe "@include omega()" do
     end
   end
 
-  context "with argument 'table'" do
+  context "with argument (table)" do
     it "removes right padding" do
       expect('.omega-table').to have_rule('padding-right: 0')
     end
   end
 
-  context "with argument 'block, left'" do
-    it "removes left margin" do
-      expect('.omega-block-left').to have_rule('margin-left: 0')
-    end
-  end
-
-  context "with argument 'table, left'" do
-    it "removes left padding" do
-      expect('.omega-table-left').to have_rule('padding-left: 0')
-    end
-  end
-
-  context "with argument '4n'" do
+  context "with argument (4n)" do
     it "removes right margin of nth-child(4n)" do
       expect('.omega-nth-default:nth-child(4n)').to have_rule('margin-right: 0')
     end
+
+    it "adds clear to nth-child(4n+1)" do
+      expect('.omega-nth-default:nth-child(4n+1)').to have_rule('clear: left')
+    end
   end
 
-  context "with argument '4n table'" do
+  context "with argument (4n table)" do
     it "removes right padding of nth-child(4n)" do
       expect('.omega-nth-table:nth-child(4n)').to have_rule('padding-right: 0')
     end
   end
 
-  context "with argument '4n block, left'" do
-    it "removes left margin of nth-child(4n)" do
-      expect('.omega-nth-default-left:nth-child(4n)').to have_rule('margin-left: 0')
+  context "with argument ('4n+1')" do
+    it "removes right margin of nth-child(4n+1)" do
+      expect('.omega-complex-nth:nth-child(4n+1)').to have_rule('margin-right: 0')
     end
   end
 
-  context "with argument '4n table, left'" do
-    it "removes left padding of nth-child(4n)" do
-      expect('.omega-nth-table-left:nth-child(4n)').to have_rule('padding-left: 0')
+  context "when called inside an RTL row" do
+    context "with no argument" do
+      it "removes left margin" do
+        expect('section .omega-default-left').to have_rule('margin-left: 0')
+      end
+    end
+
+    context "with argument (table)" do
+      it "removes left padding" do
+        expect('section .omega-table-left').to have_rule('padding-left: 0')
+      end
+    end
+
+    context "with argument (4n block)" do
+      it "removes left margin of nth-child(4n)" do
+        expect('section .omega-nth-default-left:nth-child(4n)').to have_rule('margin-left: 0')
+      end
+    end
+
+    context "with argument (4n table)" do
+      it "removes left padding of nth-child(4n)" do
+        expect('section .omega-nth-table-left:nth-child(4n)').to have_rule('padding-left: 0')
+      end
     end
   end
 end

data/spec/neat/pad_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper'
 
 describe "@include pad()" do
-  let (:identifier) {"pad"}
-
   before(:all) do
-    ParserSupport.parse_file(identifier)
+    ParserSupport.parse_file("pad")
   end
 
   context "with no argument" do
@@ -13,20 +11,20 @@ describe "@include pad()" do
     end
   end
 
-  context "with argument '20px'" do
-    it "sets padding to '20px'" do
+  context "with argument (20px)" do
+    it "sets padding to 20px" do
       expect('.pad-explicit').to have_rule('padding: 20px')
     end
   end
 
-  context "with argument '30px 20px 10px 5px'" do
-    it "sets padding to '30px 20px 10px 5px'" do
+  context "with argument (30px 20px 10px 5px)" do
+    it "sets padding to 30px 20px 10px 5px" do
       expect('.pad-shorthand').to have_rule('padding: 30px 20px 10px 5px')
     end
   end
 
-  context "with argument 'default' keyword" do
-    it "replaces 'default' with gutter percentage" do
+  context "with argument (default)" do
+    it "uses default gutter percentage" do
       expect('.pad-shorthand-default').to have_rule('padding: 30px 2.35765% 10px 2.35765%')
     end
   end

data/spec/neat/row_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper'
 
 describe "@include row()" do
-  let (:identifier) {"row"}
-
   before(:all) do
-    ParserSupport.parse_file(identifier)
+    ParserSupport.parse_file("row")
   end
 
   context "with no argument" do
@@ -17,7 +15,7 @@ describe "@include row()" do
     end
   end
 
-  context "with argument 'table'" do
+  context "with argument (table)" do
     it "sets display to table" do
       expect('.row-table').to have_rule('display: table')
     end

data/spec/neat/shift_spec.rb

@@ -1,26 +1,24 @@
 require 'spec_helper'
 
 describe "@include shift()" do
-  let (:identifier) {"shift"}
-
   before(:all) do
-    ParserSupport.parse_file(identifier)
+    ParserSupport.parse_file("shift")
   end
 
   context "with no argument" do
-    it "shifts element one column to the left" do
+    it "shifts element one column in the default direction" do
       expect('.shift-default').to have_rule('margin-left: 8.5298%')
     end
   end
 
-  context "with argument '2'" do
-    it "shifts element 2 column to the left" do
+  context "with argument (2)" do
+    it "shifts element 2 columns in the default direction" do
       expect('.shift-positive').to have_rule('margin-left: 17.05961%')
     end
   end
 
-  context "with argument '-3'" do
-    it "shifts element 3 column to the right" do
+  context "with argument (-3)" do
+    it "shifts element 3 columns in the opposite direction" do
       expect('.shift-negative').to have_rule('margin-left: -25.58941%')
     end
   end
@@ -34,4 +32,10 @@ describe "@include shift()" do
       expect('.post-nested-shift').to have_rule('margin-left: 17.05961%')
     end
   end
+
+  context "when layout direction changes" do
+    it "shifts element in the corresponding direction" do
+      expect('section .shift-negative').to have_rule('margin-right: -25.58941%')
+    end
+  end
 end

data/test/omega.scss

@@ -2,22 +2,12 @@
 
 .omega-default {
   @include omega;
-  color: #000;
 }
 
 .omega-table {
   @include omega(table);
 }
 
-.omega-block-left {
-  @include omega(block, left);
-  color: #000;
-}
-
-.omega-table-left{
-  @include omega(table, left);
-}
-
 .omega-nth-default {
   @include omega(4n)
 }
@@ -26,10 +16,27 @@
   @include omega(4n table);
 }
 
-.omega-nth-default-left {
-  @include omega(4n block, left);
+.omega-complex-nth {
+  @include omega("4n+1");
 }
 
-.omega-nth-table-left {
-  @include omega(4n table, left);
+section {
+  @include row($direction: RTL);
+
+  .omega-default-left {
+    @include omega;
+  }
+
+  .omega-table-left{
+    @include omega(table);
+  }
+
+  .omega-nth-default-left {
+    @include omega(4n block);
+  }
+
+  .omega-nth-table-left {
+    @include omega(4n table);
+    @include reset-layout-direction;
+  }
 }

data/test/shift.scss

@@ -1,9 +1,5 @@
 @import 'setup';
 
-.shift-default {
-  @include shift;
-}
-
 .shift-positive {
   @include shift(2);
 }
@@ -25,3 +21,17 @@
 .post-nested-shift {
   @include shift(2);
 }
+
+// Changing direction
+section {
+  @include row($direction: RTL);
+
+  .shift-negative {
+    @include shift(-3);
+    @include reset-layout-direction;
+  }
+}
+
+.shift-default {
+  @include shift;
+}

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neat
 version: !ruby/object:Gem::Version
-  version: 1.2.1
-  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors:
 - Kyle Fiedler
@@ -11,101 +10,136 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70191797038060 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70191797038060
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bourbon
-  requirement: &70191797037300 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70191797037300
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70191797031800 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70191797031800
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70191797030940 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191797030940
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: css_parser
-  requirement: &70191797030080 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191797030080
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70191797028820 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191797028820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70191797026780 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191797026780
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70191797006460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191797006460
-description: ! 'Neat is an open source grid framework built on top of Bourbon with
-  the aim of being easy enough to use out of the box and flexible enough to customize
-  down the road.
-
-'
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+description: |
+  Neat is an open source grid framework built on top of Bourbon with the aim of being easy enough to use out of the box and flexible enough to customize down the road.
 email:
 - support@thoughtbot.com
 executables:
@@ -127,12 +161,13 @@ files:
 - app/assets/stylesheets/functions/_private.scss
 - app/assets/stylesheets/functions/_px-to-em.scss
 - app/assets/stylesheets/grid/_fill-parent.scss
-- app/assets/stylesheets/grid/_global-variables.scss
 - app/assets/stylesheets/grid/_grid.scss
 - app/assets/stylesheets/grid/_media.scss
 - app/assets/stylesheets/grid/_omega.scss
 - app/assets/stylesheets/grid/_outer-container.scss
 - app/assets/stylesheets/grid/_pad.scss
+- app/assets/stylesheets/grid/_private.scss
+- app/assets/stylesheets/grid/_reset.scss
 - app/assets/stylesheets/grid/_row.scss
 - app/assets/stylesheets/grid/_shift.scss
 - app/assets/stylesheets/grid/_span-columns.scss
@@ -173,33 +208,26 @@ files:
 - test/span-columns.scss
 homepage: https://github.com/thoughtbot/neat
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1770698003665574111
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1770698003665574111
 requirements: []
 rubyforge_project: neat
-rubygems_version: 1.8.15
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A fluid grid framework on top of Bourbon
 test_files:
 - spec/neat/columns_spec.rb

data/app/assets/stylesheets/grid/_global-variables.scss

@@ -1,5 +0,0 @@
-$parent-columns: $grid-columns !default;
-$fg-column: $column;
-$fg-gutter: $gutter;
-$fg-max-columns: $grid-columns;
-$container-display-table: false !default;