From: Marcel Werk Date: Fri, 16 Dec 2016 12:32:20 +0000 (+0100) Subject: Fixed multiple display:flex issues in IE11 X-Git-Tag: 3.0.0_RC_2~47 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ce2800175a9da3f3dd0af7335de56deadc2847d0;p=GitHub%2FWoltLab%2FWCF.git Fixed multiple display:flex issues in IE11 --- diff --git a/wcfsetup/install/files/style/layout/box.scss b/wcfsetup/install/files/style/layout/box.scss index 9adcf3bc22..1d6479e29c 100644 --- a/wcfsetup/install/files/style/layout/box.scss +++ b/wcfsetup/install/files/style/layout/box.scss @@ -149,40 +149,48 @@ @include screen-sm-md { flex: 0 0 50%; + max-width: 50%; &.boxFullWidth { flex-basis: 100%; + max-width: none; } /* one item */ &:first-child:nth-last-child(1) { flex-basis: 100%; + max-width: none; } } @include screen-lg { flex: 0 0 25%; margin-bottom: 60px; + max-width: 25%; &.boxFullWidth { flex-basis: 100%; + max-width: none; } /* one item */ &:first-child:nth-last-child(1) { flex-basis: 100%; + max-width: none; } /* two items */ &:first-child:nth-last-child(2), &:first-child:nth-last-child(2) ~ .box { flex-basis: 50%; + max-width: 50%; } /* three items */ &:first-child:nth-last-child(3), &:first-child:nth-last-child(3) ~ .box { flex-basis: 33.3333%; + max-width: 33.3333%; } } } @@ -671,9 +679,11 @@ @include screen-md-up { flex: 0 0 50%; margin-bottom: 60px; + max-width: 50%; &.boxFullWidth { flex-basis: 100%; + max-width: none; } } } @@ -816,6 +826,7 @@ > li { flex: 0 0 25%; margin-bottom: 20px; + max-width: 25%; > .boxMenuLink { @include wcfFontHeadline; diff --git a/wcfsetup/install/files/style/layout/containerList.scss b/wcfsetup/install/files/style/layout/containerList.scss index 2411de62e1..97323e12e4 100644 --- a/wcfsetup/install/files/style/layout/containerList.scss +++ b/wcfsetup/install/files/style/layout/containerList.scss @@ -196,6 +196,7 @@ &.doubleColumned > li { flex: 0 0 50%; + max-width: 50%; } &.tripleColumned > li { diff --git a/wcfsetup/install/files/style/layout/grid.scss b/wcfsetup/install/files/style/layout/grid.scss index 0bc405bfd6..fa8bd23378 100644 --- a/wcfsetup/install/files/style/layout/grid.scss +++ b/wcfsetup/install/files/style/layout/grid.scss @@ -28,46 +28,57 @@ .col-xs-1 { flex: 0 0 8.333333%; + max-width: 8.333333%; } .col-xs-2 { flex: 0 0 16.666667%; + max-width: 16.666667%; } .col-xs-3 { flex: 0 0 25%; + max-width: 25%; } .col-xs-4 { flex: 0 0 33.333333%; + max-width: 33.333333%; } .col-xs-5 { flex: 0 0 41.666667%; + max-width: 41.666667%; } .col-xs-6 { flex: 0 0 50%; + max-width: 50%; } .col-xs-7 { flex: 0 0 58.333333%; + max-width: 58.333333%; } .col-xs-8 { flex: 0 0 66.666667%; + max-width: 66.666667%; } .col-xs-9 { flex: 0 0 75%; + max-width: 75%; } .col-xs-10 { flex: 0 0 83.333333%; + max-width: 83.333333%; } .col-xs-11 { flex: 0 0 91.666667%; + max-width: 91.666667%; } .col-xs-12 { @@ -129,39 +140,51 @@ @include screen-md-up { .col-md-1 { flex: 0 0 8.333333%; + max-width: 8.333333%; } .col-md-2 { flex: 0 0 16.666667%; + max-width: 16.666667%; } .col-md-3 { flex: 0 0 25%; + max-width: 25%; } .col-md-4 { flex: 0 0 33.333333%; + max-width: 33.333333%; } .col-md-5 { flex: 0 0 41.666667%; + max-width: 41.666667%; } .col-md-6 { flex: 0 0 50%; + max-width: 50%; } .col-md-7 { flex: 0 0 58.333333%; + max-width: 58.333333%; } .col-md-8 { flex: 0 0 66.666667%; + max-width: 66.666667%; } .col-md-9 { flex: 0 0 75%; + max-width: 75%; } .col-md-10 { flex: 0 0 83.333333%; + max-width: 83.333333%; } .col-md-11 { flex: 0 0 91.666667%; + max-width: 91.666667%; } .col-md-12 { flex: 0 0 100%; + max-width: none; } .col-md-pull-0 { right: auto; diff --git a/wcfsetup/install/files/style/ui/messageEditHistory.scss b/wcfsetup/install/files/style/ui/messageEditHistory.scss index 8bae5c6f47..d946d94bd0 100644 --- a/wcfsetup/install/files/style/ui/messageEditHistory.scss +++ b/wcfsetup/install/files/style/ui/messageEditHistory.scss @@ -10,6 +10,7 @@ > div { flex: 0 0 50%; + max-width: 50%; &:first-child { padding-right: 10px;