Skip to content
This repository has been archived by the owner on Jul 14, 2023. It is now read-only.

Commit

Permalink
Restore compatibility with Sass 3.2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
Reda Lemeden committed Apr 6, 2014
1 parent 736a2fb commit 460c71a
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion app/assets/stylesheets/_neat.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Bourbon Neat 1.6.0.pre
// Bourbon Neat 1.5.1
// MIT Licensed
// Copyright (c) 2012-2013 thoughtbot, inc.

Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/functions/_new-breakpoint.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/functions/_private.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions app/assets/stylesheets/grid/_media.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
@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;
}
}

@else {
$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;
}

Expand All @@ -32,7 +32,7 @@

@media #{$mediaQuery} {
@content;
$grid-columns: $default-grid-columns !global;
$grid-columns: $default-grid-columns;
}
}
}
4 changes: 2 additions & 2 deletions app/assets/stylesheets/grid/_private.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/grid/_reset.scss
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions app/assets/stylesheets/grid/_row.scss
Original file line number Diff line number Diff line change
@@ -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;
}
}

4 changes: 2 additions & 2 deletions app/assets/stylesheets/grid/_shift.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

@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);

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;
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/grid/_span-columns.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion lib/neat/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Neat
VERSION = '1.6.0'
VERSION = '1.5.1'
end
2 changes: 1 addition & 1 deletion neat.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down

0 comments on commit 460c71a

Please sign in to comment.