diff --git a/app/assets/stylesheets/_neat.scss b/app/assets/stylesheets/_neat.scss index e1721712..a44f6e2c 100644 --- a/app/assets/stylesheets/_neat.scss +++ b/app/assets/stylesheets/_neat.scss @@ -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"; diff --git a/app/assets/stylesheets/grid/_reset-display.scss b/app/assets/stylesheets/grid/_reset-display.scss new file mode 100644 index 00000000..b8332b87 --- /dev/null +++ b/app/assets/stylesheets/grid/_reset-display.scss @@ -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; +} diff --git a/app/assets/stylesheets/grid/_row.scss b/app/assets/stylesheets/grid/_row.scss index 4d913a92..81501607 100644 --- a/app/assets/stylesheets/grid/_row.scss +++ b/app/assets/stylesheets/grid/_row.scss @@ -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; diff --git a/app/assets/stylesheets/grid/_to-deprecate.scss b/app/assets/stylesheets/grid/_to-deprecate.scss index aeea0795..b46d9760 100644 --- a/app/assets/stylesheets/grid/_to-deprecate.scss +++ b/app/assets/stylesheets/grid/_to-deprecate.scss @@ -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 diff --git a/contrib/styles.scss b/contrib/styles.scss index 9d97a2fc..0576b53b 100644 --- a/contrib/styles.scss +++ b/contrib/styles.scss @@ -1,4 +1,4 @@ -@import "../app/assets/stylesheets/neat"; +$visual-grid: true !global; // Grid Settings $column: 90px; @@ -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); @@ -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;