sass/ezy/grid/_layout.scss in ezy-0.3.0.beta vs sass/ezy/grid/_layout.scss in ezy-0.3.1.beta
- old
+ new
@@ -15,11 +15,12 @@
$columns,
$grid-padding : false,
$at-breakpoint : false,
$column-width : false,
$gutter-width : false,
- $legacy-support : false
+ $legacy-support : false,
+ $is-fluid : $is-fluid
) {
// Catching media breakpoints from set-breakpoint
@if type-of( $at-breakpoint ) == "list" {
@if ( not $legacy-support ) and length( $at-breakpoint ) > 1 {
@@ -27,11 +28,11 @@
$legacy-support: nth( $at-breakpoint, 2 );
$at-breakpoint: nth( $at-breakpoint, 1 );
}
}
- $layout: ( $columns ($grid-padding) ($at-breakpoint) $column-width $gutter-width $legacy-support );
+ $layout: ( $columns ($grid-padding) ($at-breakpoint) $column-width $gutter-width $legacy-support $is-fluid );
// Storing layout
$layouts: append( $layouts, $layout, comma );
@return $layout;
@@ -46,10 +47,11 @@
$legacy-support : false
) {
// Storing reference to global variables
$at-breakpoint-ref : $at-breakpoint;
+ $is-fluid-ref : $is-fluid;
$total-columns-ref : $total-columns;
$grid-padding-ref : $grid-padding;
$column-width-ref : $column-width;
$gutter-width-ref : $gutter-width;
@@ -57,10 +59,11 @@
$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 );
// Use general settings if false
@if not $grid-padding {
$grid-padding : $grid-padding-ref;
}
@@ -84,9 +87,10 @@
@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;
}