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

Commit

Permalink
Silence warnings
Browse files Browse the repository at this point in the history
- Closes #148
  • Loading branch information
Reda Lemeden committed Mar 21, 2014
1 parent 616c4b7 commit 7ffce78
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
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);
$visual-grid-breakpoints: append($visual-grid-breakpoints, $query, comma) !global;
}

@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 !default;
$parent-columns: $grid-columns !global !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;
$grid-columns: $total-columns !global;
@content;
$grid-columns: $default-grid-columns;
$grid-columns: $default-grid-columns !global;
}
}

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

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

@media #{$mediaQuery} {
@content;
$grid-columns: $default-grid-columns;
$grid-columns: $default-grid-columns !global;
}
}
}
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;
$parent-columns: $columns !global;
} @else {
$parent-columns: $grid-columns;
$parent-columns: $grid-columns !global;
}

@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;
$container-display-table: false !global;
}

@mixin reset-layout-direction {
$layout-direction: $default-layout-direction;
$layout-direction: $default-layout-direction !global;
}

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

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);
$parent-columns: container-shift($shift) !global;

$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;
$parent-columns: $grid-columns !global;
}
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);
$parent-columns: get-parent-columns($container-columns) !global;

$direction: get-direction($layout-direction, $default-layout-direction);
$opposite-direction: get-opposite-direction($direction);
Expand Down
4 changes: 2 additions & 2 deletions neat.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ Neat is an open source grid framework built on top of Bourbon with the aim of be
s.require_paths = ['lib']

s.add_dependency('sass', '>= 3.3')
s.add_dependency('bourbon', '>= 3.1')
s.add_dependency('bourbon', '~> 3.0')

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')
Expand Down
2 changes: 1 addition & 1 deletion spec/support/sass_support.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 7ffce78

Please sign in to comment.