diff --git a/app/assets/stylesheets/_neat.scss b/app/assets/stylesheets/_neat.scss index e93d636e..09ed00e1 100644 --- a/app/assets/stylesheets/_neat.scss +++ b/app/assets/stylesheets/_neat.scss @@ -1,4 +1,4 @@ -// Bourbon Neat 1.6.0.pre +// Bourbon Neat 1.5.1 // MIT Licensed // Copyright (c) 2012-2013 thoughtbot, inc. diff --git a/app/assets/stylesheets/functions/_new-breakpoint.scss b/app/assets/stylesheets/functions/_new-breakpoint.scss index a89c9ce6..83aed7e5 100644 --- a/app/assets/stylesheets/functions/_new-breakpoint.scss +++ b/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) !global; + $visual-grid-breakpoints: append($visual-grid-breakpoints, $query, comma); } @return $query; diff --git a/app/assets/stylesheets/functions/_private.scss b/app/assets/stylesheets/functions/_private.scss index 6f03cfcc..cf65391b 100644 --- a/app/assets/stylesheets/functions/_private.scss +++ b/app/assets/stylesheets/functions/_private.scss @@ -45,7 +45,7 @@ } @function container-shift($shift: $shift) { - $parent-columns: $grid-columns !global !default; + $parent-columns: $grid-columns !default; @if length($shift) == 3 { $container-columns: nth($shift, 3); diff --git a/app/assets/stylesheets/grid/_media.scss b/app/assets/stylesheets/grid/_media.scss index bf27f70e..fdc6c3f6 100644 --- a/app/assets/stylesheets/grid/_media.scss +++ b/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 !global; + $grid-columns: $total-columns; @content; - $grid-columns: $default-grid-columns !global; + $grid-columns: $default-grid-columns; } } @@ -12,10 +12,10 @@ $loopTo: length($query); $mediaQuery: 'screen and '; $default-grid-columns: $grid-columns; - $grid-columns: $total-columns !global; + $grid-columns: $total-columns; @if length($query) % 2 != 0 { - $grid-columns: nth($query, $loopTo) !global; + $grid-columns: nth($query, $loopTo); $loopTo: $loopTo - 1; } @@ -32,7 +32,7 @@ @media #{$mediaQuery} { @content; - $grid-columns: $default-grid-columns !global; + $grid-columns: $default-grid-columns; } } } diff --git a/app/assets/stylesheets/grid/_private.scss b/app/assets/stylesheets/grid/_private.scss index b1953368..5d818534 100644 --- a/app/assets/stylesheets/grid/_private.scss +++ b/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 !global; + $parent-columns: $columns; } @else { - $parent-columns: $grid-columns !global; + $parent-columns: $grid-columns; } @return $parent-columns; diff --git a/app/assets/stylesheets/grid/_reset.scss b/app/assets/stylesheets/grid/_reset.scss index 496c4a77..f670019e 100644 --- a/app/assets/stylesheets/grid/_reset.scss +++ b/app/assets/stylesheets/grid/_reset.scss @@ -1,9 +1,9 @@ @mixin reset-display { - $container-display-table: false !global; + $container-display-table: false; } @mixin reset-layout-direction { - $layout-direction: $default-layout-direction !global; + $layout-direction: $default-layout-direction; } @mixin reset-all { diff --git a/app/assets/stylesheets/grid/_row.scss b/app/assets/stylesheets/grid/_row.scss index 81da6d36..582603dd 100644 --- a/app/assets/stylesheets/grid/_row.scss +++ b/app/assets/stylesheets/grid/_row.scss @@ -1,17 +1,17 @@ @mixin row($display: block, $direction: $default-layout-direction) { @include clearfix; - $layout-direction: $direction !global; + $layout-direction: $direction; @if $display == table { display: table; @include fill-parent; table-layout: fixed; - $container-display-table: true !global; + $container-display-table: true; } @else { display: block; - $container-display-table: false !global; + $container-display-table: false; } } diff --git a/app/assets/stylesheets/grid/_shift.scss b/app/assets/stylesheets/grid/_shift.scss index 1d27b9b7..30c4f535 100644 --- a/app/assets/stylesheets/grid/_shift.scss +++ b/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) !global; + $parent-columns: container-shift($shift); $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 !global; + $parent-columns: $grid-columns; } diff --git a/app/assets/stylesheets/grid/_span-columns.scss b/app/assets/stylesheets/grid/_span-columns.scss index c79193d9..e59e4e26 100644 --- a/app/assets/stylesheets/grid/_span-columns.scss +++ b/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) !global; + $parent-columns: get-parent-columns($container-columns); $direction: get-direction($layout-direction, $default-layout-direction); $opposite-direction: get-opposite-direction($direction); diff --git a/bower.json b/bower.json index cee0025a..5428e0fc 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "neat", - "version": "1.6.0", + "version": "1.5.1", "homepage": "http://neat.bourbon.io/", "main": "app/assets/stylesheets/_neat.scss", "ignore": [ diff --git a/lib/neat/version.rb b/lib/neat/version.rb index d9bfaaab..a4b00c44 100644 --- a/lib/neat/version.rb +++ b/lib/neat/version.rb @@ -1,3 +1,3 @@ module Neat - VERSION = '1.6.0' + VERSION = '1.5.1' end diff --git a/neat.gemspec b/neat.gemspec index 7e67d93b..fd3e1406 100644 --- a/neat.gemspec +++ b/neat.gemspec @@ -22,7 +22,7 @@ Neat is an open source grid framework built on top of Bourbon with the aim of be s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } s.require_paths = ['lib'] - s.add_dependency('sass', '>= 3.3') + s.add_dependency('sass', '~> 3.2.19') s.add_dependency('bourbon', '>= 3.1') s.add_development_dependency('aruba', '~> 0.5.0')