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

b718b716 · Mark Otto · 8c0e1f32 · bf439363 · b718b716 · b718b716
Commit b718b716 authored 8 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 5 additions and 2 deletions
+5 -2
--- 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) {

--- 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: