diff options
| author | Mark Otto <[email protected]> | 2016-10-30 14:48:42 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-10-30 14:48:42 -0700 |
| commit | b718b716270243f66e04fe87616aa688cb3ebb10 (patch) | |
| tree | ae765540b680aeeb53b767d89690e9079987fad3 | |
| parent | 8c0e1f32b6646ecc8e5b81dae4e8a44d9a4770db (diff) | |
| parent | bf439363775c98d900f7ef3d6d0297fa8887ef58 (diff) | |
| download | bootstrap-b718b716270243f66e04fe87616aa688cb3ebb10.tar.xz bootstrap-b718b716270243f66e04fe87616aa688cb3ebb10.zip | |
Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev
| -rw-r--r-- | js/src/util.js | 2 | ||||
| -rw-r--r-- | scss/_input-group.scss | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/js/src/util.js b/js/src/util.js index f9e7f77fa..5ddbbbf13 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -121,7 +121,7 @@ const Util = (($) => { }, reflow(element) { - new Function('bs', 'return bs')(element.offsetHeight) + return element.offsetHeight }, triggerTransitionEnd(element) { diff --git a/scss/_input-group.scss b/scss/_input-group.scss index 7eef23a9d..17b9c8402 100644 --- a/scss/_input-group.scss +++ b/scss/_input-group.scss @@ -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: |