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

saturnliu · Oct 30, 2016 · b718b71 · b718b71
2 parents 8c0e1f3 + bf43936
commit b718b71
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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: