mirror/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-24 03:40:10 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Otto 2016-10-30 14:48:42 -07:00
commit b718b71627
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/util.js
View File

@ -121,7 +121,7 @@ const Util = (($) => {
}, },
reflow(element) { reflow(element) {
new Function('bs', 'return bs')(element.offsetHeight) return element.offsetHeight
}, },
triggerTransitionEnd(element) { triggerTransitionEnd(element) {

5
scss/_input-group.scss
View File

@ -26,7 +26,10 @@
} }
@if $enable-flex { @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 { } @else {
// IE9 fubars the placeholder attribute in text inputs and the arrows on // 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: // select elements in input groups. To fix it, we float the input. Details: