sass/ezy/grid/_layout.scss in ezy-0.3.3 vs sass/ezy/grid/_layout.scss in ezy-0.4.0.beta

- old
+ new

@@ -31,22 +31,22 @@ } $layout: ( $columns ($grid-padding) ($at-breakpoint) $column-width $gutter-width $legacy-support $is-fluid ); // Storing layout - $layouts: append( $layouts, $layout, comma ); + $layouts: append( $layouts, $layout, comma ) !global; @return $layout; } // --------------------------------------------------------------------------- // @mixin at-layout -@mixin at-layout( - $layout, - $legacy-support : false +@mixin at-layout( + $layout, + $legacy-support : false ) { // Storing reference to global variables $at-breakpoint-ref : $at-breakpoint; $is-fluid-ref : $is-fluid; @@ -54,26 +54,26 @@ $grid-padding-ref : $grid-padding; $column-width-ref : $column-width; $gutter-width-ref : $gutter-width; // Using settings from layout - $total-columns : nth( $layout, 1 ); - $grid-padding : nth( $layout, 2 ); - $at-breakpoint : nth( $layout, 3 ); - $column-width : nth( $layout, 4 ); - $gutter-width : nth( $layout, 5 ); - $is-fluid : nth( $layout, 7 ); + $total-columns : nth( $layout, 1 ) !global; + $grid-padding : nth( $layout, 2 ) !global; + $at-breakpoint : nth( $layout, 3 ) !global; + $column-width : nth( $layout, 4 ) !global; + $gutter-width : nth( $layout, 5 ) !global; + $is-fluid : nth( $layout, 7 ) !global; // Use general settings if false @if not $grid-padding { - $grid-padding : $grid-padding-ref; + $grid-padding : $grid-padding-ref !global; } @if not $column-width { - $column-width : $column-width-ref; + $column-width : $column-width-ref !global; } @if not $gutter-width { - $gutter-width : $gutter-width-ref; + $gutter-width : $gutter-width-ref !global; } // Get legacy support setting from layout if not forced @if not $legacy-support { $legacy-support : nth( $layout, 6 ); @@ -86,15 +86,15 @@ } @else { @content; } // Resetting references to original values - $at-breakpoint : $at-breakpoint-ref; - $is-fluid : $is-fluid-ref; - $total-columns : $total-columns-ref; - $grid-padding : $grid-padding-ref; - $column-width : $column-width-ref; - $gutter-width : $gutter-width-ref; + $at-breakpoint : $at-breakpoint-ref !global; + $is-fluid : $is-fluid-ref !global; + $total-columns : $total-columns-ref !global; + $grid-padding : $grid-padding-ref !global; + $column-width : $column-width-ref !global; + $gutter-width : $gutter-width-ref !global; } // --------------------------------------------------------------------------- // @mixin each-layout