neat 1.1.0 → 1.2.0

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/CONTRIBUTING.md

@@ -1,7 +1,8 @@
 We love pull requests. Here's a quick guide:
 
-1. Fork the repo.
+1. Fork the repository.
 2. Make your changes in a topic branch.
+3. Run `rake` to see if you changes are breaking any existing functionality.
 3. Squash your commits into a single one (more on that [here](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html)).
 4. Rebase against `origin/master`, push to your fork and submit a pull request.
 
@@ -11,7 +12,8 @@ day). We may suggest some changes or improvements or alternatives.
 
 Some things that will increase the chance that your pull request is accepted:
 
-* Fix a bug, refactor code or expand an existing feature
+* Fix a bug, refactor code or expand an existing feature.
+* Write [RSpec](https://www.relishapp.com/rspec) tests for your new features.
 * Use the right syntax and naming conventions.
 * Update parts of the documentation that are affected by your contribution.
 

data/NEWS.md

@@ -1,26 +1,31 @@
+1.2.0 (2013-02-18)
+
+  * New: Auto-detect table layout when `span-columns()` is called inside `row(table)`
+  * Fix: Make `shift()` reset context after each nested call
+
 1.1.0 (2013-01-09)
  
-  * New: pad() takes shorthand arguments
-  * Refactor: Merge omega() and nth-omega()
-  * Fix: Last child in table layouts keep its right-padding
+  * New: `pad()` takes shorthand arguments
+  * Refactor: Merge `omega()` and `nth-omega()`
+  * Fix: Last child in table layouts keeps its right-padding
 
 1.0.2 (2012-11-19)
 
-  * Fix [Issue 38](https://github.com/thoughtbot/neat/issues/38) by adding explicit require to the bourbon gem
+  * Fix: Add explicit require to the bourbon gem [#38](https://github.com/thoughtbot/neat/issues/38) 
 
 1.0.1 (2012-11-06)
 
-  * Fix bug where the return type in the `em()` function was a string instead of a number
-  * Fix bug related to relative path imports in Rails
+  * Fix: Make `em()` always return a number
+  * Fix: Relative path imports in Rails
 
 1.0.0 (2012-10-29)
 
-  * Add executable for non-Rails projects
-  * Add visual grid
-  * Add `media` and `new-breakpoint` mixins
-  * Add `_neat-helpers.scss` as a public interface for Neat
-  * Fix bug in the `shift()` mixin for nested columns
-  * Remove typography mixins and settings
+  * New: Add executable for non-Rails projects
+  * New: Add visual grid
+  * New: Add `media` and `new-breakpoint` mixins
+  * New: Add `_neat-helpers.scss` as a public interface for Neat
+  * Fix: Make `shift()` work properly in nested contexts
+  * Refactor: Remove typography mixins and settings
 
 0.4.2 (2012-08-31)
 

data/README.md

@@ -132,13 +132,6 @@ Likewise for inline-block:
 @include span-columns(6 of 8, inline-block)
 ```
 
-The following syntaxes would also work:
-
-```scss
-@include span-columns(6 / 8,inline-block);
-@include span-columns(6 8,inline-block);
-```
-
 ### Rows
 In order to clear floated or table-cell columns, use the `row` mixin:
 
@@ -179,8 +172,8 @@ Neat removes by default the last column's gutter. However, if you are queueing m
 ```scss
 @include omega; // Removes the right gutter (margin) of the element
 @include omega(table); // Removes the right gutter (padding) of a table-cell element
-@include omega(4n) // Removes every 4th right gutter (margin)
-@include omega(4n table) // Removes every 4th right gutter (padding) of a table-cell element
+@include omega(4n); // Removes every 4th right gutter (margin)
+@include omega(4n table); // Removes every 4th right gutter (padding) of a table-cell element
 ```
 
 The `omega` mixin takes any valid `:nth-child` value. Composite values such as `3n+5` should be passed as strings in order to work: `omega('3n+5')`. See [https://developer.mozilla.org/en-US/docs/CSS/:nth-child](Mozilla's :nth-child documentation)
@@ -422,6 +415,11 @@ Here is the list of the available settings:
 - IE 9+ (Visual grid is IE10 only)
 - IE 8 with [selectivizr](http://selectivizr.com) (no `media()` support)
 
+Roadmap
+===
+
+The development roadmap can be tracked on this public [Trello board](http://bit.ly/neat-trello).
+
 Credits
 ===
 

data/Rakefile

@@ -1,2 +1,22 @@
+require 'rubygems'
 require 'bundler'
+require 'rspec/core/rake_task'
 Bundler::GemHelper.install_tasks
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+
+task :test do
+  puts "Creating a Bourbon directory..."
+  `bourbon install --path test`
+  puts "Generating CSS..."
+  `sass --watch test:css/ --style expanded`
+end # task :test
+
+task :clean do
+  puts "Deleting Bourbon directory..."
+  `rm -rf test/bourbon`
+  puts "Deleting generated CSS..."
+  `rm -rf css/`
+end # task :clean

data/app/assets/stylesheets/_neat.scss

@@ -9,4 +9,12 @@
 @import "grid/global-variables";
 @import "grid/grid";
 @import "grid/omega";
+@import "grid/outer-container";
+@import "grid/span-columns";
+@import "grid/row";
+@import "grid/shift";
+@import "grid/pad";
+@import "grid/fill-parent";
+@import "grid/media";
+@import "grid/to-deprecate";
 @import "grid/visual-grid";

data/app/assets/stylesheets/grid/_fill-parent.scss

@@ -0,0 +1,7 @@
+@mixin fill-parent() {
+  width: 100%;
+
+  @if $border-box-sizing == false {
+    @include box-sizing(border-box);
+  }
+}

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

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

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

@@ -3,208 +3,3 @@
     @include box-sizing(border-box);
   }
 }
-
-$fg-column: $column;
-$fg-gutter: $gutter;
-$fg-max-columns: $grid-columns;
-$fg-max-width: $max-width;
-
-// outer wrapper center container
-@mixin outer-container() {
-  @include clearfix;
-  max-width: $fg-max-width;
-  margin: {
-    left: auto;
-    right: auto;
-  }
-}
-
-// Grid span columns
-@mixin span-columns($span: $columns of $container-columns, $display: block) {
-
-  $columns: nth($span, 1);
-  $container-columns: container-span($span);
-
-  @if $container-columns != $grid-columns {
-    $parent-columns: $container-columns;
-  }
-
-  @else {
-    $parent-columns: $grid-columns;
-  }
-
-  @if $display == table {
-    display: table-cell;
-    padding-right: flex-gutter($container-columns);
-    width: flex-grid($columns, $container-columns) + flex-gutter($container-columns);
-
-    &:last-child {
-      width: flex-grid($columns, $container-columns);
-    }
-  }
-
-  @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;
-    }
-  }
-
-  @else {
-    display: block;
-    float: left;
-    margin-right: flex-gutter($container-columns);
-    width: flex-grid($columns, $container-columns);
-
-    &:last-child {
-      margin-right: 0;
-    }
-  }
-}
-
-// Clearfix / row container
-@mixin row($display: block) {
-  @include clearfix;
-  @if $display == table {
-    display: table;
-  }
-
-  @else {
-    display: block;
-  }
-}
-
-// Shift
-@mixin shift($n-columns: 1) {
-  margin-left: $n-columns * flex-grid(1, $parent-columns) + $n-columns * flex-gutter($parent-columns);
-}
-
-
-// Pad
-@mixin pad($padding: flex-gutter()) {
-  $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
-@mixin fill-parent() {
-  width: 100%;
-
-  @if $border-box-sizing == false {
-    @include box-sizing(border-box);
-  }
-}
-
-// Media Queries
-@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;
-      $grid-columns: $total-columns;
-      @content;
-      $grid-columns: $default-grid-columns;
-    }
-  }
-
-  @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 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;
-    }
-  }
-
-  @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;
-    }
-  }
-
-  @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);
-      @content;
-      $grid-columns: $default-grid-columns;
-    }
-  }
-
-  @else {
-    @warn "Wrong number of arguments for breakpoint(). Read the documentation for more details.";
-  }
-}
-
-// Legacy Mixins
-@mixin breakpoint($query:$feature $value $columns, $total-columns: $grid-columns) {
-  @warn "The breakpoint() mixin was renamed to media() in Neat 1.0. Please update your project with the new syntax before the next version bump.";
-
-  @if length($query) == 1 {
-    @media screen and ($default-feature: nth($query, 1)) {
-      $default-grid-columns: $grid-columns;
-      $grid-columns: $total-columns;
-      @content;
-      $grid-columns: $default-grid-columns;
-    }
-  }
-
-  @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 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;
-    }
-  }
-
-  @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;
-    }
-  }
-
-  @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);
-      @content;
-      $grid-columns: $default-grid-columns;
-    }
-  }
-
-  @else {
-    @warn "Wrong number of arguments for breakpoint(). Read the documentation for more details.";
-  }
-}

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

@@ -0,0 +1,51 @@
+@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;
+      $grid-columns: $total-columns;
+      @content;
+      $grid-columns: $default-grid-columns;
+    }
+  }
+
+  @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 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;
+    }
+  }
+
+  @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;
+    }
+  }
+
+  @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);
+      @content;
+      $grid-columns: $default-grid-columns;
+    }
+  }
+
+  @else {
+    @warn "Wrong number of arguments for breakpoint(). Read the documentation for more details.";
+  }
+}

data/app/assets/stylesheets/grid/_outer-container.scss

@@ -0,0 +1,8 @@
+@mixin outer-container {
+  @include clearfix;
+  max-width: $max-width;
+  margin: {
+    left: auto;
+    right: auto;
+  }
+}

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

@@ -0,0 +1,8 @@
+@mixin pad($padding: flex-gutter()) {
+  $padding-list: null;
+  @each $value in $padding {
+    $value: if($value == 'default', flex-gutter(), $value);
+    $padding-list: join($padding-list, $value);
+  }
+  padding: $padding-list;
+}

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

@@ -0,0 +1,16 @@
+@mixin row($display: block) {
+  @include clearfix;
+  @if $display == table {
+    display: table;
+    $container-display-table: true;
+  }
+
+  @else {
+    display: block;
+    $container-display-table: false;
+  }
+}
+
+@mixin reset-display {
+  $container-display-table: false;
+}