neat 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91ae990df97858138440bb7970ca0455b0341a6a
-  data.tar.gz: d3f9a225a1ee9f9a03f59305fc94c75784cb194d
+  metadata.gz: 96bb57df9fe71265794ef5dbcfd6f88ac84cc967
+  data.tar.gz: f3f4d4c5e306187c5a274fcdc014df8d22c402de
 SHA512:
-  metadata.gz: d5fa2e3ad5de0b1e533a158ba3f093910b51754dadffe6366083c0554f5bce6dbfd4eb479f43307fb38b70e88e71ed832fa4556c46819e56182b5e59723242b3
-  data.tar.gz: 6163574b88d69ebf81656306568e663978589057ebf472b851d8487998b16bb34f7428e82dcd9eb9a9ab3da3dd458793c21864decdc13167f229f3455b8123fc
+  metadata.gz: ca3a41c7ec83d932a931f81542dad5bfecca05adef5f99526181b65cfb14a25f764ea008e6bbf25dd17217b6c148a9421e3e0454b29d18324261afd2687e12ef
+  data.tar.gz: c879ea4649d50196a7046d90168b1a10470eba34fe57f917a1befa368780a7394e4d9c14b14e66a6d94ac897eb333ea943097d39acd567acff245c9e2afebd0c

data/LICENSE

@@ -2,7 +2,7 @@ LICENSE
 
 The MIT License
 
-Copyright (c) 2012-2013 thoughtbot, inc.
+Copyright (c) 2012-2014 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/README.md

@@ -177,6 +177,7 @@ Links
 - 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).
+- Join `#bourbon-neat` on `irc.freenode.net`.
 
 
 Credits & License
@@ -186,4 +187,4 @@ Credits & 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.
+Bourbon Neat is Copyright © 2012-2014 thoughtbot. It is free software, and may be redistributed under the terms specified in the LICENSE file.

data/Rakefile

@@ -11,7 +11,7 @@ task :test do
   puts "Creating a Bourbon directory..."
   `bourbon install --path test`
   puts "Generating CSS..."
-  `sass --watch test:css/ --style expanded`
+  `sass -I . --watch test:css/ --style expanded`
 end
 
 task :clean do

data/app/assets/stylesheets/_neat.scss

@@ -1,4 +1,4 @@
-// Bourbon Neat 1.5.0
+// Bourbon Neat 1.5.1
 // MIT Licensed
 // Copyright (c) 2012-2013 thoughtbot, inc.
 

data/app/assets/stylesheets/functions/_new-breakpoint.scss

@@ -4,7 +4,7 @@
     $query: $default-feature nth($query, 1) $total-columns;
   }
 
-  @else if length($query) == 2 or length($query) == 4 {
+  @else if length($query) % 2 == 0 {
     $query: append($query, $total-columns);
   }
 

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

@@ -45,7 +45,7 @@
 }
 
 @function container-shift($shift: $shift) {
-  $parent-columns: $grid-columns !default;
+  $parent-columns: $grid-columns  !default;
 
   @if length($shift) == 3 {
     $container-columns: nth($shift, 3);

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

@@ -1,5 +1,4 @@
 @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;
@@ -9,43 +8,31 @@
     }
   }
 
-  @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 {
+    $loopTo: length($query);
+    $mediaQuery: 'screen and ';
+    $default-grid-columns: $grid-columns;
+    $grid-columns: $total-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;
+    @if length($query) % 2 != 0 {
+      $grid-columns: nth($query, $loopTo);
+      $loopTo: $loopTo - 1;
     }
-  }
 
-  @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;
+    $i: 1;
+    @while $i <= $loopTo {
+      $mediaQuery: $mediaQuery + '(' + nth($query, $i) + ': ' + nth($query, $i + 1) + ') ';
+
+      @if ($i + 1) != $loopTo {
+        $mediaQuery: $mediaQuery + 'and ';
+      }
+
+      $i: $i + 2;
     }
-  }
 
-  @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);
+    @media #{$mediaQuery} {
       @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/_omega.scss

@@ -9,6 +9,10 @@
     $direction: get-direction($layout-direction, $default-layout-direction);
   }
 
+  @if $table {
+    @warn "The omega mixin no longer removes padding in table layouts."
+  }
+
   @if length($query) == 1 {
     @if $auto {
       &:last-child {
@@ -16,14 +20,8 @@
       }
     }
 
-    @else if contains-display-value($query) {
-      @if $table {
-        padding-#{$direction}: 0;
-      }
-
-      @else {
-        margin-#{$direction}: 0;
-      }
+    @else if contains-display-value($query) and $table == false {
+      margin-#{$direction}: 0;
     }
 
     @else {
@@ -32,30 +30,14 @@
   }
 
   @else if length($query) == 2 {
-    @if $table {
-      @if $auto {
-        &:last-child {
-          padding-#{$direction}: 0;
-        }
-      }
-
-      @else {
-        &:nth-child(#{nth($query, 1)}) {
-          padding-#{$direction}: 0;
-        }
+    @if $auto {
+      &:last-child {
+        margin-#{$direction}: 0;
       }
     }
 
     @else {
-      @if $auto {
-        &:last-child {
-          margin-#{$direction}: 0;
-        }
-      }
-
-      @else {
-        @include nth-child(nth($query, 1), $direction);
-      }
+      @include nth-child(nth($query, 1), $direction);
     }
   }
 

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

@@ -41,10 +41,3 @@ $layout-direction: nil !default;
 
   @return $display-table;
 }
-
-@function get-padding-for-table-layout($columns, $total-columns) {
-  $total-padding: flex-gutter($total-columns) * ($columns - 1);
-  $padding: $total-padding / $columns;
-
-  @return $padding;
-}

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

@@ -11,10 +11,8 @@
   $display-table: is-display-table($container-display-table, $display);
 
   @if $display-table  {
-    $padding: get-padding-for-table-layout($columns, $container-columns);
     display: table-cell;
-    padding-#{$direction}: $padding;
-    width: flex-grid($columns, $container-columns) + $padding;
+    width: percentage($columns / $container-columns);
   } @else {
     float: #{$opposite-direction};
 

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "neat",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "homepage": "http://neat.bourbon.io/",
   "main": "app/assets/stylesheets/_neat.scss",
   "ignore": [
@@ -12,6 +12,9 @@
     "Rakefile",
     "neat.gemspec",
     "CONTRIBUTING.md",
-    "NEWS.md",
-  ]
+    "NEWS.md"
+  ],
+  "dependencies": {
+    "bourbon": ">=3.1"
+  }
 }

data/lib/neat/version.rb

@@ -1,3 +1,3 @@
 module Neat
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 end

data/neat.gemspec

@@ -3,29 +3,29 @@ $:.push File.expand_path('../lib', __FILE__)
 require 'neat/version'
 
 Gem::Specification.new do |s|
-  s.name        = "neat"
+  s.name        = 'neat'
   s.version     = Neat::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Kyle Fiedler", "Reda Lemeden", "Joel Oliveira"]
-  s.email       = ["support@thoughtbot.com"]
-  s.homepage    = "https://github.com/thoughtbot/neat"
-  s.summary     = "A fluid grid framework on top of Bourbon"
+  s.authors     = ['Kyle Fiedler', 'Reda Lemeden', 'Joel Oliveira']
+  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
 
-  s.rubyforge_project = "neat"
+  s.rubyforge_project = 'neat'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.add_dependency('sass', '>= 3.2')
-  s.add_dependency('bourbon', '>= 2.1')
+  s.add_dependency('sass', '~> 3.2.19')
+  s.add_dependency('bourbon', '>= 3.1')
 
-  s.add_development_dependency('aruba', '~> 0.4')
+  s.add_development_dependency('aruba', '~> 0.5.0')
   s.add_development_dependency('rake')
   s.add_development_dependency('css_parser')
   s.add_development_dependency('rspec')

data/spec/neat/columns_spec.rb

@@ -42,8 +42,8 @@ describe "@include span-columns()" do
       expect('.span-columns-table').to have_rule('display: table-cell')
     end
 
-    it "sets padding evenly between table cells" do
-      expect('.span-columns-table').to have_rule('padding-right: 1.17883%')
+    it "sets width evenly between elements" do
+      expect('.span-columns-table').to have_rule('width: 50%')
     end
   end
 

data/spec/neat/media_spec.rb

@@ -42,4 +42,14 @@ describe "@include media()" do
       expect('.change-media-context-shorthand').to have_rule('width: 100%')
     end
   end
+
+  context "with composite argument (max-width 768px min-width 110px orientation portait 6)" do
+    it "outputs @media screen and (max-width: 768px) and (min-width: 110px) and (orientation: portait)" do
+      expect('.composite-media-query').to be_contained_in('screen and (max-width: 768px) and (min-width: 110px) and (orientation: portait)')
+    end
+
+    it "uses a 6-column grid" do
+      expect('.composite-media-query').to have_rule('width: 100%')
+    end
+  end
 end

data/spec/neat/omega_spec.rb

@@ -11,12 +11,6 @@ describe "@include omega()" do
     end
   end
 
-  context "with argument (table)" do
-    it "removes right padding" do
-      expect('.omega-table').to have_rule('padding-right: 0')
-    end
-  end
-
   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')
@@ -27,12 +21,6 @@ describe "@include omega()" do
     end
   end
 
-  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+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')
@@ -46,22 +34,10 @@ describe "@include omega()" do
       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/support/sass_support.rb

@@ -1,7 +1,7 @@
 module SassSupport
   def generate_css
     _mkdir('tmp')
-    `sass --update test:tmp --style expanded`
+    `sass -I . --update test:tmp`
   end
 
   def clean_up

data/test/media.scss

@@ -1,5 +1,7 @@
 @import 'setup';
 
+$composite: new-breakpoint(max-width 768px min-width 110px orientation portait 6);
+
 .media-default {
   @include media(481px) {
     color: #000;
@@ -29,3 +31,9 @@
     @include span-columns(6);
   }
 }
+
+.composite-media-query {
+  @include media($composite) {
+    @include span-columns(6);
+  }
+}

data/test/omega.scss

@@ -4,18 +4,10 @@
   @include omega;
 }
 
-.omega-table {
-  @include omega(table);
-}
-
 .omega-nth-default {
   @include omega(4n)
 }
 
-.omega-nth-table {
-  @include omega(4n table);
-}
-
 .omega-complex-nth {
   @include omega("4n+1");
 }
@@ -27,16 +19,7 @@ section {
     @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/span-columns.scss

@@ -9,7 +9,7 @@
 }
 
 .span-columns-table {
-  @include span-columns(2, table);
+  @include span-columns(6, table);
 }
 
 .span-columns-collapse {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neat
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Kyle Fiedler
@@ -10,132 +10,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.19
 - !ruby/object:Gem::Dependency
   name: bourbon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: css_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   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: |
@@ -147,8 +147,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -216,17 +216,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: neat
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A fluid grid framework on top of Bourbon