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

This commit is contained in:
Christopher Baker 2016-04-27 19:30:39 -07:00
commit 859c12a044
11 changed files with 59 additions and 9 deletions

Binary file not shown.

View file

@ -228,6 +228,26 @@
origin: >
Bootstrap#16372
-
browser: >
Safari
summary: >
`rem` units in media queries should be calculated using `font-size: initial`, not the root element's `font-size`
upstream_bug: >
WebKit#156684
origin: >
Bootstrap#17403
-
browser: >
Safari (OS X)
summary: >
`px`, `em`, and `rem` should all behave the same in media queries when page zoom is applied
upstream_bug: >
WebKit#156687
origin: >
Bootstrap#17403
-
browser: >
Safari (OS X)

File diff suppressed because one or more lines are too long

Binary file not shown.

View file

@ -5933,6 +5933,18 @@ a.bg-danger:focus, a.bg-danger:hover {
clear: both;
}
.d-block {
display: block !important;
}
.d-inline-block {
display: inline-block !important;
}
.d-inline {
display: inline !important;
}
.pull-xs-left {
float: left !important;
}
@ -6013,6 +6025,10 @@ a.bg-danger:focus, a.bg-danger:hover {
clip: auto;
}
.w-100 {
width: 100% !important;
}
.m-x-auto {
margin-right: auto !important;
margin-left: auto !important;

Binary file not shown.

File diff suppressed because one or more lines are too long

Binary file not shown.

View file

@ -408,13 +408,7 @@ const Modal = (($) => {
}
_checkScrollbar() {
let fullWindowWidth = window.innerWidth
if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8
let documentElementRect = document.documentElement.getBoundingClientRect()
fullWindowWidth =
documentElementRect.right - Math.abs(documentElementRect.left)
}
this._isBodyOverflowing = document.body.clientWidth < fullWindowWidth
this._isBodyOverflowing = document.body.clientWidth < window.innerWidth
this._scrollbarWidth = this._getScrollbarWidth()
}

View file

@ -159,6 +159,16 @@
border-color: $custom-select-focus-border-color;
outline: none;
@include box-shadow($custom-select-focus-box-shadow);
&::-ms-value {
// For visual consistency with other platforms/browsers,
// supress the default white text on blue background highlight given to
// the selected option text when the (still closed) <select> receives focus
// in IE and (under certain conditions) Edge.
// See https://github.com/twbs/bootstrap/issues/19398.
color: $input-color;
background-color: $input-bg;
}
}
// Hides the default caret in IE11

View file

@ -60,6 +60,16 @@ select.form-control {
&:not([size]):not([multiple]) {
height: $input-height;
}
&:focus::-ms-value {
// Suppress the nested default white text on blue background highlight given to
// the selected option text when the (still closed) <select> receives focus
// in IE and (under certain conditions) Edge, as it looks bad and cannot be made to
// match the appearance of the native widget.
// See https://github.com/twbs/bootstrap/issues/19398.
color: $input-color;
background-color: $input-bg;
}
}
// Make file inputs better match text inputs by forcing them to new lines.