neat 1.6.0.pre → 1.6.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69a0ec024eab967f90e54cab55d41cc0396cf1b1
-  data.tar.gz: 6d4ab0534d288fc22b2d79931c07684095efc238
+  metadata.gz: d677e315545289ee861c6c418c6726366543beb1
+  data.tar.gz: 542c331b6147e9d80ee51e5ae1f8bb30c0cb9c7e
 SHA512:
-  metadata.gz: 10ed8986ea12d1ef7d22824305e2712657de402755e72855b6f9d8d96d55627e0db552ac485cebf1f68f3715399e4ba58dd0de82ca61c0690e991505e3c05fd8
-  data.tar.gz: 35ecd709322fd7d85304b7a57a67aeaab155dbeaa221d29cb206185e238401f338dc43a9c1290553f79130bbb0a8eb9a9d563bdbc0b5f250f23947b99305626b
+  metadata.gz: b9d357524340fe82ebf755860156376ef9e4514a07b7a40a6df6bb6b3b996784c5e6039cd8d6444be8852a0baf1a099ca4f2fed080532c09da71b04c0913c588
+  data.tar.gz: 6dd8b859fbd22f10e5f7e209f97c90d33e5a09cdee8b70a2f0a17c65a9eacb850ead35d4bf32d37e772f9ff08b100f23a003d7fcf3a528c1d843c2f6d64959b4

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/functions/_new-breakpoint.scss

@@ -9,7 +9,7 @@
   }
 
   @if not belongs-to($query, $visual-grid-breakpoints) {
-    $visual-grid-breakpoints: append($visual-grid-breakpoints, $query, comma);
+    $visual-grid-breakpoints: append($visual-grid-breakpoints, $query, comma) !global;
   }
 
   @return $query;

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 !global !default;
 
   @if length($shift) == 3 {
     $container-columns: nth($shift, 3);

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

@@ -2,9 +2,9 @@
   @if length($query) == 1 {
     @media screen and ($default-feature: nth($query, 1)) {
       $default-grid-columns: $grid-columns;
-      $grid-columns: $total-columns;
+      $grid-columns: $total-columns !global;
       @content;
-      $grid-columns: $default-grid-columns;
+      $grid-columns: $default-grid-columns !global;
     }
   }
 
@@ -12,10 +12,10 @@
     $loopTo: length($query);
     $mediaQuery: 'screen and ';
     $default-grid-columns: $grid-columns;
-    $grid-columns: $total-columns;
+    $grid-columns: $total-columns !global;
 
     @if length($query) % 2 != 0 {
-      $grid-columns: nth($query, $loopTo);
+      $grid-columns: nth($query, $loopTo) !global;
       $loopTo: $loopTo - 1;
     }
 
@@ -32,7 +32,7 @@
 
     @media #{$mediaQuery} {
       @content;
-      $grid-columns: $default-grid-columns;
+      $grid-columns: $default-grid-columns !global;
     }
   }
 }

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

@@ -22,9 +22,9 @@ $layout-direction: nil !default;
 
 @function get-parent-columns($columns) {
   @if $columns != $grid-columns {
-    $parent-columns: $columns;
+    $parent-columns: $columns !global;
   } @else {
-    $parent-columns: $grid-columns;
+    $parent-columns: $grid-columns !global;
   }
 
   @return $parent-columns;

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

@@ -1,9 +1,9 @@
 @mixin reset-display {
-  $container-display-table: false;
+  $container-display-table: false !global;
 }
 
 @mixin reset-layout-direction {
-  $layout-direction: $default-layout-direction;
+  $layout-direction: $default-layout-direction !global;
 }
 
 @mixin reset-all {

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

@@ -1,17 +1,17 @@
 @mixin row($display: block, $direction: $default-layout-direction) {
   @include clearfix;
-  $layout-direction: $direction;
+  $layout-direction: $direction !global;
 
   @if $display == table {
     display: table;
     @include fill-parent;
     table-layout: fixed;
-    $container-display-table: true;
+    $container-display-table: true !global;
   }
 
   @else {
     display: block;
-    $container-display-table: false;
+    $container-display-table: false !global;
   }
 }
 

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

@@ -4,7 +4,7 @@
 
 @mixin shift-in-context($shift: $columns of $container-columns) {
   $n-columns: nth($shift, 1);
-  $parent-columns: container-shift($shift);
+  $parent-columns: container-shift($shift) !global;
 
   $direction: get-direction($layout-direction, $default-layout-direction);
   $opposite-direction: get-opposite-direction($direction);
@@ -12,5 +12,5 @@
   margin-#{$opposite-direction}: $n-columns * flex-grid(1, $parent-columns) + $n-columns * flex-gutter($parent-columns);
 
   // Reset nesting context
-  $parent-columns: $grid-columns;
+  $parent-columns: $grid-columns !global;
 }

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

@@ -3,7 +3,7 @@
   $container-columns: container-span($span);
 
   // Set nesting context (used by shift())
-  $parent-columns: get-parent-columns($container-columns);
+  $parent-columns: get-parent-columns($container-columns) !global;
 
   $direction: get-direction($layout-direction, $default-layout-direction);
   $opposite-direction: get-opposite-direction($direction);

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "neat",
-  "version": "1.6.0.pre",
+  "version": "1.6.0.pre2",
   "homepage": "http://neat.bourbon.io/",
   "main": "app/assets/stylesheets/_neat.scss",
   "ignore": [
@@ -15,6 +15,6 @@
     "NEWS.md"
   ],
   "dependencies": {
-    "bourbon": ">=2.1"
+    "bourbon": ">=3.1"
   }
 }

data/lib/neat/version.rb

@@ -1,3 +1,3 @@
 module Neat
-  VERSION = '1.6.0.pre'
+  VERSION = '1.6.0.pre2'
 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.3')
+  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/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neat
 version: !ruby/object:Gem::Version
-  version: 1.6.0.pre
+  version: 1.6.0.pre2
 platform: ruby
 authors:
 - Kyle Fiedler
@@ -10,132 +10,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-03-21 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.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !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,12 +216,12 @@ 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: 1.3.1
 requirements: []