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

fix(layout): remove some duplicate layout > flex styles #11613

Merged
merged 1 commit into from
Feb 1, 2019
Merged

fix(layout): remove some duplicate layout > flex styles #11613

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
41 changes: 22 additions & 19 deletions src/core/style/layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@

@mixin flex-properties-for-name($name: null) {
$flexName: 'flex';
// $name would be something like xs, sm, md, lg, xl
@if $name != null {
$flexName: 'flex-#{$name}';
$name : '-#{$name}';
Expand Down Expand Up @@ -149,24 +150,26 @@
box-sizing: border-box;
}

.layout#{$name}-row > .#{$flexName}-#{$i * 5} {
flex: 1 1 100%;
max-width: #{$value};
max-height: 100%;
box-sizing: border-box;

// Required by Chrome M48+ due to http://crbug.com/546034
@if $i == 0 { min-width: 0; }
}

.layout#{$name}-column > .#{$flexName}-#{$i * 5} {
flex: 1 1 100%;
max-width: 100%;
max-height: #{$value};
box-sizing: border-box;

// Required by Chrome M48+ due to http://crbug.com/546034
@if $i == 0 { min-height: 0; }
@if ($name != '') {
.layout#{$name}-row > .#{$flexName}-#{$i * 5} {
flex: 1 1 100%;
max-width: #{$value};
max-height: 100%;
box-sizing: border-box;

// Required by Chrome M48+ due to http://crbug.com/546034
@if $i == 0 { min-width: 0; }
}

.layout#{$name}-column > .#{$flexName}-#{$i * 5} {
flex: 1 1 100%;
max-width: 100%;
max-height: #{$value};
box-sizing: border-box;

// Required by Chrome M48+ due to http://crbug.com/546034
@if $i == 0 { min-height: 0; }
}
}
}

Expand All @@ -190,7 +193,7 @@
> .#{$flexName}-66 { flex: 1 1 100%; max-width: 66.66%; max-height: 100%; box-sizing: border-box; }

// Required by Chrome M48+ due to http://crbug.com/546034
> .flex { min-width: 0; }
> .flex { min-width: 0; }
}

.layout#{$name}-column {
Expand Down