diff options
| author | XhmikosR <[email protected]> | 2017-09-26 17:46:16 +0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-09-26 17:46:16 +0300 |
| commit | c090c79a709a84cb6e2bd5dbed6343ae49c861a1 (patch) | |
| tree | cadb5d1e7a94588047081bb8d8c4f92914aaf043 /dist/css/bootstrap.css | |
| parent | 8e56145e45e9d58e23c5f339b6cac50e751e36a7 (diff) | |
| parent | 3eae92f1fec3c84acf38bd7e16a14eac48868334 (diff) | |
| download | bootstrap-c090c79a709a84cb6e2bd5dbed6343ae49c861a1.tar.xz bootstrap-c090c79a709a84cb6e2bd5dbed6343ae49c861a1.zip | |
Merge branch 'v4-dev' into btn-active
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index f799f8397..baa88cc80 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3530,6 +3530,8 @@ tbody.collapse.show { .navbar-collapse { -ms-flex-preferred-size: 100%; flex-basis: 100%; + -ms-flex-positive: 1; + flex-grow: 1; -ms-flex-align: center; align-items: center; } @@ -3597,6 +3599,8 @@ tbody.collapse.show { .navbar-expand-sm .navbar-collapse { display: -ms-flexbox !important; display: flex !important; + -ms-flex-preferred-size: auto; + flex-basis: auto; } .navbar-expand-sm .navbar-toggler { display: none; @@ -3643,6 +3647,8 @@ tbody.collapse.show { .navbar-expand-md .navbar-collapse { display: -ms-flexbox !important; display: flex !important; + -ms-flex-preferred-size: auto; + flex-basis: auto; } .navbar-expand-md .navbar-toggler { display: none; @@ -3689,6 +3695,8 @@ tbody.collapse.show { .navbar-expand-lg .navbar-collapse { display: -ms-flexbox !important; display: flex !important; + -ms-flex-preferred-size: auto; + flex-basis: auto; } .navbar-expand-lg .navbar-toggler { display: none; @@ -3735,6 +3743,8 @@ tbody.collapse.show { .navbar-expand-xl .navbar-collapse { display: -ms-flexbox !important; display: flex !important; + -ms-flex-preferred-size: auto; + flex-basis: auto; } .navbar-expand-xl .navbar-toggler { display: none; @@ -3784,6 +3794,8 @@ tbody.collapse.show { .navbar-expand .navbar-collapse { display: -ms-flexbox !important; display: flex !important; + -ms-flex-preferred-size: auto; + flex-basis: auto; } .navbar-expand .navbar-toggler { |