mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Merge branch 'v4-dev' into v4-forms-cleanup

Browse Source
This commit is contained in:
Mark Otto
2016-04-23 14:24:08 -07:00
parent 29ff8e8b14 1a6d0cc446
commit 9f2ab98026
27 changed files with 142 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/dist/css/bootstrap.css
+10
View File
@@ -2151,6 +2151,11 @@ select.form-control:not([size]):not([multiple]) {
height: 2.5rem;
}
select.form-control:focus::-ms-value {
color: #55595c;
background-color: #fff;
}
.form-control-file,
.form-control-range {
display: block;
@@ -3732,6 +3737,11 @@ input[type="button"].btn-block {
outline: none;
}
.custom-select:focus::-ms-value {
color: #55595c;
background-color: #fff;
}
.custom-select::-ms-expand {
opacity: 0;
}
docs/dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.min.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/js/bootstrap.js
+1 -7
View File
@@ -2062,13 +2062,7 @@ var Modal = (function ($) {
}, {
key: '_checkScrollbar',
value: function _checkScrollbar() {
var fullWindowWidth = window.innerWidth;
if (!fullWindowWidth) {
// workaround for missing window.innerWidth in IE8
var 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();
}
}, {
docs/dist/js/bootstrap.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
docs/dist/js/umd/modal.js
Vendored
+1 -7
View File
@@ -427,13 +427,7 @@
}, {
key: '_checkScrollbar',
value: function _checkScrollbar() {
var fullWindowWidth = window.innerWidth;
if (!fullWindowWidth) {
// workaround for missing window.innerWidth in IE8
var 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();
}
}, {