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

Commit

Permalink
Remove deprecation warning from reset-display
Browse files Browse the repository at this point in the history
  • Loading branch information
whmii committed Jul 8, 2016
1 parent e9b3f36 commit 80a98ee
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 25 deletions.
1 change: 1 addition & 0 deletions app/assets/stylesheets/_neat.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
@import "grid/pad";
@import "grid/fill-parent";
@import "grid/media";
@import "grid/reset-display";
@import "grid/to-deprecate";
@import "grid/visual-grid";
@import "grid/display-context";
Expand Down
14 changes: 14 additions & 0 deletions app/assets/stylesheets/grid/_reset-display.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/// Resets the active display property to `block`. Particularly useful when changing the display property in a single row.
///
/// @example scss - Usage
/// .element {
/// @include row(table);
/// // Context changed to table display
/// }
///
/// @include reset-display;
/// // Context is reset to block display

@mixin reset-display {
$container-display-table: false !global;
}
7 changes: 0 additions & 7 deletions app/assets/stylesheets/grid/_row.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,9 @@
/// }

@mixin row($display: default, $direction: $default-layout-direction) {
@if $direction != $default-layout-direction {
@include -neat-warn("The $direction argument will be deprecated in future versions in favor of the direction(){...} mixin.");
}

$layout-direction: $direction !global;

@if $display != default {
@include -neat-warn("The $display argument will be deprecated in future versions in favor of the display(){...} mixin.");
}

@if $display == table {
display: table;
@include fill-parent;
Expand Down
16 changes: 0 additions & 16 deletions app/assets/stylesheets/grid/_to-deprecate.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,6 @@
@include omega($nth $display, $direction);
}

/// Resets the active display property to `block`. Particularly useful when changing the display property in a single row.
///
/// @example scss - Usage
/// .element {
/// @include row(table);
/// // Context changed to table display
/// }
///
/// @include reset-display;
/// // Context is reset to block display

@mixin reset-display {
$container-display-table: false !global;
@include -neat-warn("Resetting $display will be deprecated in future versions in favor of the display(){...} mixin.");
}

/// Resets the active layout direction to the default value set in `$default-layout-direction`. Particularly useful when changing the layout direction in a single row.
///
/// @example scss - Usage
Expand Down
6 changes: 4 additions & 2 deletions contrib/styles.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../app/assets/stylesheets/neat";
$visual-grid: true !global;

// Grid Settings
$column: 90px;
Expand All @@ -10,6 +10,8 @@ $max-width: 1200px;
$medium-screen: 600px;
$large-screen: 900px;

@import "../app/assets/stylesheets/neat";

$medium-screen-up: new-breakpoint(min-width $medium-screen 4);
$large-screen-up: new-breakpoint(min-width $large-screen 8);

Expand All @@ -18,7 +20,7 @@ $base-line-height: 1.625;
$base-spacing: $base-line-height * 1em;

// Visual Grid
$visual-grid: true;

$visual-grid-color: #e6f6ff;
$visual-grid-opacity: 0.4;

Expand Down

0 comments on commit 80a98ee

Please sign in to comment.