vendor/assets/scss/grid/_row.scss in foundation-rails-6.1.2.0 vs vendor/assets/scss/grid/_row.scss in foundation-rails-6.2.0.0
- old
+ new
@@ -46,17 +46,16 @@
$behavior: null,
$width: $grid-row-width,
$cf: true,
$gutter: $grid-column-gutter
) {
- $behavior: -zf-get-options($behavior, nest collapse);
$margin: auto;
- @if map-get($behavior, nest) {
+ @if index($behavior, nest) != null {
@include grid-row-nest($gutter);
- @if map-get($behavior, collapse) {
+ @if index($behavior, collapse) != null {
margin-left: 0;
margin-right: 0;
}
}
@else {
@@ -77,22 +76,19 @@
}
/// Inverts the margins of a row to nest it inside of a column.
///
/// @param {Map|null} $gutter [null] - Gutter value to use when inverting the margins. Set to `null` to refer to the responsive gutter settings.
-@mixin grid-row-nest($gutter: null) {
- @if $gutter != null {
- $margin: rem-calc($gutter) / 2 * -1;
- margin-left: $margin;
- margin-right: $margin;
+@mixin grid-row-nest($gutter: $grid-column-gutter) {
+ @if type-of($gutter) == 'number' {
+ $gutter: (small: $gutter);
}
- @else {
- @each $breakpoint, $value in $grid-column-responsive-gutter {
- $margin: rem-calc($value) / 2 * -1;
- @include breakpoint($breakpoint) {
- margin-left: $margin;
- margin-right: $margin;
- }
+ @each $breakpoint, $value in $gutter {
+ $margin: rem-calc($value) / 2 * -1;
+
+ @include breakpoint($breakpoint) {
+ margin-left: $margin;
+ margin-right: $margin;
}
}
}