neat 1.0.2 → 1.1.0

data/CONTRIBUTING.md

@@ -0,0 +1,33 @@
+We love pull requests. Here's a quick guide:
+
+1. Fork the repo.
+2. Make your changes in a topic branch.
+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.
+
+At this point you're waiting on us. We like to at least comment on, if not
+accept, pull requests within three business days (and, typically, one business
+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
+* Use the right syntax and naming conventions.
+* Update parts of the documentation that are affected by your contribution.
+
+**Git Commit Messages**
+
+* Capitalize your commit messages.
+* Start your message with a verb.
+* Use present tense.
+* Refer to the issue/PR number in your squashed commit message.
+
+**SCSS Style Guide**
+
+* Two spaces, no tabs.
+* Dashes instead of underscores or camel case: `span-columns` **not** `span_columns` or `spanColumns`
+* Names should be descriptive and written in full-words: `$visual-grid-color` **not** `$color` or `$vslgrd-clr`
+* Space between property and value: `width: 20px` **not** `width:20px`
+* Declarations within a block should be ordered alphabetically.
+* Blank lines between rules.
+* No trailing whitespace. Blank lines should not have any space.

data/LICENSE

@@ -2,7 +2,7 @@ LICENSE
 
 The MIT License
 
-Copyright (c) 2012 thoughtbot, inc.
+Copyright (c) 2012-2013 thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS.md

@@ -1,3 +1,9 @@
+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
+
 1.0.2 (2012-11-19)
 
   * Fix [Issue 38](https://github.com/thoughtbot/neat/issues/38) by adding explicit require to the bourbon gem

data/README.md

@@ -161,36 +161,29 @@ Please note that the `shift()` mixin is incompatible with display `table`.
 
 ### Padding columns
 
-To add padding around the entire column use `pad()`. By default it adds the same value as the grid's gutter but can take any unit value.
+To add padding around the entire column use `pad()`. By default it uses the grid's gutter but can take any argument, including the `padding` shorthand syntax.
 
 ```scss
-@include pad; // Adds a padding equivalent to the grid's gutter
-@include pad(20px); // Adds a padding of 20px
+@include pad; // Adds a padding equivalent to the grid's gutter --> padding: 2.35765%;
+@include pad(20px); // Adds a padding of 20px --> padding: 20px;
+@include pad(30px default); // padding: 30px 2.35765%;
+@include pad(30px 20px 10px default); // padding: 30px 20px 10px 2.35765%;
 ```
 
 The `pad()` mixin works particularly well with `span-columns(x, table)` by adding the necessary padding without breaking your table-based grid layout.
 
 ### Removing gutter
 
-Neat automatically removes the last columns's gutter. However, if you are queueing more than one row of columns within the same parent element, you need to specify which columns are considered last in their row to preserve the layout. Use the `omega` mixin to achieve this:
+Neat removes by default the last column's gutter. However, if you are queueing more than one row of columns within the same parent element, you need to specify which columns are considered last in their row to preserve the layout. Use the `omega` mixin to achieve this:
 
 ```scss
-@include omega; // Removes right gutter
+@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
 ```
 
-You can also use `nth-omega` to remove the gutter of a specific column or set of columns:
-
-```scss
-@include nth-omega(nth-child);
-```
-
-  * `nth-child` takes any valid :nth-child value. See [https://developer.mozilla.org/en-US/docs/CSS/:nth-child](Mozilla's :nth-child documentation)
-
-eg. Remove every 3rd gutter using:
-
-```scss
-@include nth-omega(3n);
-```
+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)
 
 ### Filling parent elements
 
@@ -439,4 +432,4 @@ Bourbon is maintained and funded by [thoughtbot, inc](http://thoughtbot.com/comm
 License
 ===
 
-Bourbon Neat is Copyright © 2012 thoughtbot. It is free software, and may be redistributed under the terms specified in the LICENSE file.
+Bourbon Neat is Copyright © 2012-2013 thoughtbot. It is free software, and may be redistributed under the terms specified in the LICENSE file.

data/app/assets/stylesheets/_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/app/assets/stylesheets/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/app/assets/stylesheets/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/app/assets/stylesheets/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);
+}

data/lib/neat/version.rb

@@ -1,3 +1,3 @@
 module Neat
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neat
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ 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: sass
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70352051553640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,15 +23,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.2'
+  version_requirements: *70352051553640
 - !ruby/object:Gem::Dependency
   name: bourbon
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70352051532700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -39,15 +34,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.1'
+  version_requirements: *70352051532700
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70352051530620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,15 +45,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
+  version_requirements: *70352051530620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70352051528300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -71,12 +56,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70352051528300
 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.
@@ -90,6 +70,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - NEWS.md
@@ -102,6 +83,7 @@ files:
 - app/assets/stylesheets/functions/_px-to-em.scss
 - app/assets/stylesheets/grid/_global-variables.scss
 - app/assets/stylesheets/grid/_grid.scss
+- app/assets/stylesheets/grid/_omega.scss
 - app/assets/stylesheets/grid/_visual-grid.scss
 - app/assets/stylesheets/settings/_grid.scss
 - app/assets/stylesheets/settings/_visual-grid.scss
@@ -124,17 +106,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1950241024261928513
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1950241024261928513
 requirements: []
 rubyforge_project: neat
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A fluid grid framework on top of Bourbon
 test_files: []
-has_rdoc: