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

Commit

Permalink
Revert "fix(layout): Chrome 48 bug with flexbox"
Browse files Browse the repository at this point in the history 
This reverts commit a7056cc.

# Conflicts:
#	src/core/services/layout/layout.attributes.scss
#	src/core/services/layout/layout.scss

# Conflicts:
#	src/core/services/layout/layout.scss
  • Loading branch information
@ThomasBurleson
ThomasBurleson committed Feb 25, 2016
1 parent f348e3e commit 99c9b60
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 18 deletions.
9 changes: 0 additions & 9 deletions src/core/services/layout/layout-attributes.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,6 @@ $layout-breakpoint-lg: 1920px !default;
max-width: #{$value};
max-height: 100%;
box-sizing: border-box;

@if $i == 0 { min-width: 0; }
}

[layout="column"] > [#{$flexName}="#{$i * 5}"],
Expand All @@ -181,26 +179,19 @@ $layout-breakpoint-lg: 1920px !default;
max-width: 100%;
max-height: #{$value};
box-sizing: border-box;

@if $i == 0 { min-height: 0; }
}
}

[layout="row"], [layout#{$name}="row"] {
> [#{$flexName}="33"] , > [#{$flexName}="33"] { flex: 1 1 33.33%; max-width: 33.33%; max-height: 100%; box-sizing: border-box; }
> [#{$flexName}="66"] , > [#{$flexName}="66"] { flex: 1 1 66.66%; max-width: 66.66%; max-height: 100%; box-sizing: border-box; }

> .flex { min-width: 0; }
}
[layout="column"], [layout#{$name}="column"] {
> [#{$flexName}="33"] , > [#{$flexName}="33"] { flex: 1 1 33.33%; max-width: 100%; max-height: 33.33%; box-sizing: border-box; }
> [#{$flexName}="66"] , > [#{$flexName}="66"] { flex: 1 1 66.66%; max-width: 100%; max-height: 66.66%; box-sizing: border-box; }

> .flex { min-height: 0; }
}

}

@mixin layout-align-for-name($suffix: null) {

// Alignment attributes for layout containers' children
Expand Down
9 changes: 0 additions & 9 deletions src/core/style/layout.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,6 @@
max-width: 100%;
max-height: #{$value};
box-sizing: border-box;

// Bug workaround for http://crbug.com/546034 - flex issues on Chrome 48
@if $i == 0 { min-height: 0; }
}


Expand All @@ -163,16 +160,10 @@
.layout-row, .layout#{$name}-row {
> .#{$flexName}-33 , > .#{$flexName}-33 { flex: 1 1 33.33%; max-width: 33.33%; max-height: 100%; box-sizing: border-box; }
> .#{$flexName}-66 , > .#{$flexName}-66 { flex: 1 1 66.66%; max-width: 66.66%; max-height: 100%; box-sizing: border-box; }

// Bug workaround for http://crbug.com/546034 - flex issues on Chrome 48
> .flex { min-width: 0; }
}
.layout-column, .layout#{$name}-column {
> .#{$flexName}-33 , > .#{$flexName}-33 { flex: 1 1 33.33%; max-width: 100%; max-height: 33.33%; box-sizing: border-box; }
> .#{$flexName}-66 , > .#{$flexName}-66 { flex: 1 1 66.66%; max-width: 100%; max-height: 66.66%; box-sizing: border-box; }

// Bug workaround for http://crbug.com/546034 - flex issues on Chrome 48
> .flex { min-height: 0; }
}

}
Expand Down

1 comment on commit 99c9b60

@char0n
Copy link

@char0n char0n commented on 99c9b60 Mar 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi,

Is there any particular reason why this commit was reverted ? The min-height, min-width does no longer have influence on chrome 48 but firefox is still affected without these css properties.

Can you please collaborate ?

After upgrading to angular-material 1.0.6 our application which is in holly grail layout broke down. This is the code we had to introduce to be able to run the application on Firefox and to support version 1.0.6

https://gist.github.com/anonymous/a767374e07209ae8fffa

Please sign in to comment.