2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev

This commit is contained in:
Mark Otto
2016-10-30 14:48:42 -07:00
2 changed files with 5 additions and 2 deletions
+4 -1
View File
@@ -26,7 +26,10 @@
}
@if $enable-flex {
flex: 1;
flex: 1 1 auto;
// Add width 1% and flex-basis auto to ensure that button will not wrap out
// the column. Applies to IE Edge+ and Firefox. Chrome do not require this.
width: 1%;
} @else {
// IE9 fubars the placeholder attribute in text inputs and the arrows on
// select elements in input groups. To fix it, we float the input. Details: