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

fix(layout): allow flex-offset to be a child of layout-margin #11330

Merged
merged 1 commit into from
Jun 22, 2018
Merged

fix(layout): allow flex-offset to be a child of layout-margin #11330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/core/style/layout.scss
View file
Open in desktop
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