neat 1.4.0 → 1.5.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1791bf7c055a1329480da34064aaf4e16d91ea4
-  data.tar.gz: 57900e1f7741a736869c07a076685f88643e88a0
+  metadata.gz: 7eb001e3c5e66997a8b161645de5c8e33bc7e665
+  data.tar.gz: f971fa906516e7a0efd59387d8d2e0d708f64ad0
 SHA512:
-  metadata.gz: d80a94016fbb0777ec115d2aef9389b6504cc8cdf5e2c43358f563365dc13596f9128e2cb83a2ba43994d7d757cf18fa3cfeaa10a8f93ac9113fb5cc1579f2a9
-  data.tar.gz: c7723d03cea1726e6f2f50d8d0478065f55eae232dfe3743b21ba5cd235aa5fd58b5fc8775f83ac876cd052798a1b724eb1315d4a4699bfacea93f701e04d96e
+  metadata.gz: e81fe6ea0b7be56e608cd911147d0245ed8a73504966ae9b2b1a85e83a5fd52103a40f598a6367feea1cecf1718b04ff59fb07fcdf2f249904e2f0ebc30aec04
+  data.tar.gz: c79bb4e99673679d5b6ea65e9d65403bd22fb184d014da945b21f62bcf70e02da06ad2fd0add7e1a65b8163a0d5d4825a043c1937d84e431c4539977d2d8a80c

data/README.md

@@ -169,21 +169,21 @@ Browser support
 - IE 8 with [selectivizr](http://selectivizr.com) (no `media()` support)
 
 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*)
-- [Changelog](https://github.com/thoughtbot/neat/wiki/Changelog)
-- [Roadmap Trello board](http://bit.ly/neat-trello)
+- Read the [online documentation](http://neat.bourbon.io/docs/).
+- Add the docset to [Dash](http://kapeli.com/dash) 1.8+ (Preferences **>** Downloads **>** + *Add Docset Feed* **>** `http://neat.bourbon.io/docset/Neat.xml`)
+- Ask questions on [Stack Overflow](http://stackoverflow.com/questions/tagged/neat+bourbon). Don't forget to tag them`bourbon` and `neat`.
+- Suggest features or file bugs in [Issues](https://github.com/thoughtbot/neat/issues).
+- Read the [contribution guidelines](https://github.com/thoughtbot/neat/blob/master/CONTRIBUTING.md).
+- Say hi to [@kaishin](https://twitter.com/kaishin) and [@kylefiedler](https://twitter.com/kylefiedler).
 
-Credits
-===
 
-![thoughtbot](http://thoughtbot.com/images/tm/logo.png)
+Credits & License
+=================
 
-Bourbon is maintained and funded by [thoughtbot, inc](http://thoughtbot.com/community). Tweet your questions or suggestions at [@kaishin](https://twitter.com/kaishin) and [@kylefiedler](https://twitter.com/kylefiedler).
+![thoughtbot](http://thoughtbot.com/images/tm/logo.png)
 
-License
-===
+Bourbon is maintained and funded by [thoughtbot, inc](http://thoughtbot.com/). Follow [@thoughtbot](http://twitter.com/thoughtbot) on Twitter.
 
 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-helpers.scss

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

data/app/assets/stylesheets/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/app/assets/stylesheets/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/app/assets/stylesheets/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 {

data/lib/neat/version.rb

@@ -1,3 +1,3 @@
 module Neat
-  VERSION = '1.4.0'
+  VERSION = '1.5.0.pre'
 end

data/neat.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ["support@thoughtbot.com"]
   s.homepage    = "https://github.com/thoughtbot/neat"
   s.summary     = "A fluid grid framework on top of Bourbon"
+  s.license     = 'MIT'
   s.description = <<-DESC
 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.
   DESC

data/spec/neat/columns_spec.rb

@@ -47,17 +47,27 @@ describe "@include span-columns()" do
     end
   end
 
-  context "with argument (collapse)" do
+  context "with argument (block-collapse)" do
     it "appends gutter width to column width" do
       expect('.span-columns-collapse').to have_rule('width: 51.17883%')
     end
 
     it "removes the next gutter" do
-      expect('.span-columns-collapse').to_not have_rule('margin-right')
+      expect('.span-columns-collapse').to_not have_rule('margin-right: 2.35765%')
     end
 
     it "removes gutter percentage from the width of the last child" do
       expect('.span-columns-collapse:last-child').to have_rule('width: 48.82117%')
     end
   end
+
+  context "with argument (no-display)" do
+    it "doesn't set display property" do
+      expect('.span-columns-no-display').to_not have_rule('display: block')
+    end
+
+    it "sets width in percentage based on a block layout" do
+      expect('.span-columns-no-display').to have_rule('width: 48.82117%')
+    end
+  end
 end

data/test/shift.scss

@@ -1,5 +1,9 @@
 @import 'setup';
 
+.shift-default {
+  @include shift;
+}
+
 .shift-positive {
   @include shift(2);
 }
@@ -13,8 +17,7 @@
   @include span-columns(6);
 
   .shifted-child {
-    @include span-columns(2 of 6);
-    @include shift(2);
+    @include shift(2 of 6);
   }
 }
 
@@ -31,7 +34,3 @@ section {
     @include reset-layout-direction;
   }
 }
-
-.shift-default {
-  @include shift;
-}

data/test/span-columns.scss

@@ -12,10 +12,10 @@
   @include span-columns(2, table);
 }
 
-.span-columns-inline-block {
-  @include span-columns(6, inline-block);
+.span-columns-collapse {
+  @include span-columns(6, block-collapse);
 }
 
-.span-columns-collapse {
-  @include span-columns(6, collapse);
+.span-columns-no-display {
+  @include span-columns(6, no-display);
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neat
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0.pre
 platform: ruby
 authors:
 - Kyle Fiedler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -159,7 +159,6 @@ files:
 - app/assets/stylesheets/_neat.scss
 - app/assets/stylesheets/functions/_new-breakpoint.scss
 - 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/_grid.scss
 - app/assets/stylesheets/grid/_media.scss
@@ -207,7 +206,8 @@ files:
 - test/shift.scss
 - test/span-columns.scss
 homepage: https://github.com/thoughtbot/neat
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -220,9 +220,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: neat
 rubygems_version: 2.0.3

data/app/assets/stylesheets/functions/_px-to-em.scss

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