Skip to content
This repository has been archived by the owner on Sep 5, 2024. It is now read-only.

Commit

Permalink
fix(layout): allow flex-offset to be a child of layout-margin (#11330)
Browse files Browse the repository at this point in the history
  • Loading branch information
@bersLucas @jelbourn
bersLucas authored and jelbourn committed Jun 22, 2018
1 parent a6bca73 commit 81eb46f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/core/style/layout.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
@if $s != '' { $suffix : '#{$s}-#{$i * 5}'; }
@else { $suffix : '#{$i * 5}'; }

$offsets : '.offset-#{$suffix}, .flex-offset-#{$suffix}';
$offsets : '.offset-#{$suffix}, .flex-offset-#{$suffix}, .layout-margin .flex-offset-#{$suffix}, .layout-margin .offset-#{$suffix}';
}

#{$offsets} {
Expand All @@ -62,7 +62,7 @@
@if $s != '' { $suffix : '#{$s}-#{$i}'; }
@else { $suffix : '#{$i}'; }

$offsets : '.offset-#{$suffix}, .flex-offset-#{$suffix} ';
$offsets : '.offset-#{$suffix}, .flex-offset-#{$suffix}, .layout-margin .flex-offset-#{$suffix}, .layout-margin .offset-#{$suffix}';
}

#{$offsets} {
Expand All @@ -78,7 +78,7 @@
@if $s != '' { $suffix : '#{$s}-#{$i}'; }
@else { $suffix : '#{$i}'; }

$offsets : '.offset-#{$suffix}, .flex-offset-#{$suffix} ';
$offsets : '.offset-#{$suffix}, .flex-offset-#{$suffix}, .layout-margin .flex-offset-#{$suffix}, .layout-margin .offset-#{$suffix}';
}

#{$offsets} {
Expand Down

0 comments on commit 81eb46f

Please sign in to comment.