mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-28 20:52:21 +01:00
Merge branch 'v4-dev' into v4-forms-cleanup
This commit is contained in:
commit
9f2ab98026
@ -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;
|
||||
}
|
||||
|
2
dist/css/bootstrap.css.map
vendored
2
dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
2
dist/css/bootstrap.min.css.map
vendored
2
dist/css/bootstrap.min.css.map
vendored
File diff suppressed because one or more lines are too long
@ -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();
|
||||
}
|
||||
}, {
|
||||
|
4
dist/js/bootstrap.min.js
vendored
4
dist/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
8
dist/js/umd/modal.js
vendored
8
dist/js/umd/modal.js
vendored
@ -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();
|
||||
}
|
||||
}, {
|
||||
|
@ -4,7 +4,7 @@
|
||||
summary: >
|
||||
Native browser tooltip for `title` shows on first keyboard focus (in addition to custom tooltip component)
|
||||
upstream_bug: >
|
||||
IE#2445370
|
||||
Edge#6793560
|
||||
origin: >
|
||||
Bootstrap#18692
|
||||
|
||||
@ -54,7 +54,7 @@
|
||||
summary: >
|
||||
`@-ms-viewport{width: device-width;}` has side-effect of making scrollbars auto-hide
|
||||
upstream_bug: >
|
||||
IE#2256049
|
||||
Edge#7165383
|
||||
origin: >
|
||||
Bootstrap#18543
|
||||
|
||||
@ -98,6 +98,16 @@
|
||||
origin: >
|
||||
Bootstrap#18365
|
||||
|
||||
-
|
||||
browser: >
|
||||
Firefox
|
||||
summary: >
|
||||
Fire `transitioncancel` event when a transition is canceled
|
||||
upstream_bug: >
|
||||
Mozilla#1264125
|
||||
origin: >
|
||||
Mozilla#1182856
|
||||
|
||||
-
|
||||
browser: >
|
||||
Firefox (Windows)
|
||||
@ -158,16 +168,6 @@
|
||||
origin: >
|
||||
Bootstrap#16180
|
||||
|
||||
-
|
||||
browser: >
|
||||
Chrome
|
||||
summary: >
|
||||
Incorrect viewport size used for media queries when printing.
|
||||
upstream_bug: >
|
||||
Chromium#273306
|
||||
origin: >
|
||||
Bootstrap#12078
|
||||
|
||||
-
|
||||
browser: >
|
||||
Chrome
|
||||
@ -228,15 +228,25 @@
|
||||
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: >
|
||||
Scrollbar clipped in `select[multiple]` with padding.
|
||||
`px`, `em`, and `rem` should all behave the same in media queries when page zoom is applied
|
||||
upstream_bug: >
|
||||
WebKit#128489, Safari#19208483
|
||||
WebKit#156687
|
||||
origin: >
|
||||
Bootstrap#12536
|
||||
Bootstrap#17403
|
||||
|
||||
-
|
||||
browser: >
|
||||
|
@ -3,7 +3,6 @@ module Jekyll
|
||||
def bugify(input)
|
||||
upstream_map = {
|
||||
"Bootstrap" => "https://github.com/twbs/bootstrap/issues/",
|
||||
"IE" => ["https://connect.microsoft.com/IE/feedback/details/", "IE bug"],
|
||||
"Edge" => ["https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/", "Edge issue"],
|
||||
"Mozilla" => ["https://bugzilla.mozilla.org/show_bug.cgi?id=", "Mozilla bug"],
|
||||
"Chromium" => ["https://bugs.chromium.org/p/chromium/issues/detail?id=", "Chromium issue"],
|
||||
|
@ -86,7 +86,7 @@ Extend the default collapse behavior to create an accordion.
|
||||
|
||||
Be sure to add `aria-expanded` to the control element. This attribute explicitly defines the current state of the collapsible element to screen readers and similar assistive technologies. If the collapsible element is closed by default, it should have a value of `aria-expanded="false"`. If you've set the collapsible element to be open by default using the `in` class, set `aria-expanded="true"` on the control instead. The plugin will automatically toggle this attribute based on whether or not the collapsible element has been opened or closed.
|
||||
|
||||
Additionally, if your control element is targetting a single collapsible element – i.e. the `data-target` attribute is pointing to an `id` selector – you may add an additional `aria-controls` attribute to the control element, containing the `id` of the collapsible element. Modern screen readers and similar assistive technologies make use of this attribute to provide users with additional shortcuts to navigate directly to the collapsible element itself.
|
||||
Additionally, if your control element is targeting a single collapsible element – i.e. the `data-target` attribute is pointing to an `id` selector – you may add an additional `aria-controls` attribute to the control element, containing the `id` of the collapsible element. Modern screen readers and similar assistive technologies make use of this attribute to provide users with additional shortcuts to navigate directly to the collapsible element itself.
|
||||
|
||||
## Usage
|
||||
|
||||
|
@ -16,7 +16,7 @@ Provide pagination links for your site or app with the multi-page pagination com
|
||||
Simple pagination inspired by Rdio, great for apps and search results. The large block is hard to miss, easily scalable, and provides large click areas.
|
||||
|
||||
{% example html %}
|
||||
<nav>
|
||||
<nav aria-label="Page navigation">
|
||||
<ul class="pagination">
|
||||
<li class="page-item">
|
||||
<a class="page-link" href="#" aria-label="Previous">
|
||||
@ -39,6 +39,12 @@ Simple pagination inspired by Rdio, great for apps and search results. The large
|
||||
</nav>
|
||||
{% endexample %}
|
||||
|
||||
{% callout info %}
|
||||
### Labelling the pagination component
|
||||
|
||||
The pagination component should be wrapped in a `<nav>` element to identify it as a navigation section to screen readers and other assistive technologies. In addition, as a page is likely to have more than one such navigation section already (such as the primary navigation in the header, or a sidebar navigation), it is advisable to provide a descriptive `aria-label` for the `<nav>` which reflects its purpose. For example, if the pagination component is used to navigate between a set of search results, an appropriate label could be `aria-label="Search results pages"`.
|
||||
{% endcallout %}
|
||||
|
||||
## Disabled and active states
|
||||
|
||||
Links are customizable for different circumstances. Use `.disabled` for unclickable links and `.active` to indicate the current page.
|
||||
@ -50,7 +56,7 @@ The `.disabled` class uses `pointer-events: none` to try to disable the link fun
|
||||
{% endcallout %}
|
||||
|
||||
{% example html %}
|
||||
<nav>
|
||||
<nav aria-label="...">
|
||||
<ul class="pagination">
|
||||
<li class="page-item disabled">
|
||||
<a class="page-link" href="#" tabindex="-1" aria-label="Previous">
|
||||
@ -78,7 +84,7 @@ The `.disabled` class uses `pointer-events: none` to try to disable the link fun
|
||||
You can optionally swap out active or disabled anchors for `<span>`, or omit the anchor in the case of the prev/next arrows, to remove click functionality and prevent keyboard focus while retaining intended styles.
|
||||
|
||||
{% example html %}
|
||||
<nav>
|
||||
<nav aria-label="...">
|
||||
<ul class="pagination">
|
||||
<li class="page-item disabled">
|
||||
<span class="page-link" aria-label="Previous">
|
||||
@ -97,7 +103,7 @@ You can optionally swap out active or disabled anchors for `<span>`, or omit the
|
||||
Fancy larger or smaller pagination? Add `.pagination-lg` or `.pagination-sm` for additional sizes.
|
||||
|
||||
{% example html %}
|
||||
<nav>
|
||||
<nav aria-label="...">
|
||||
<ul class="pagination pagination-lg">
|
||||
<li class="page-item">
|
||||
<a class="page-link" href="#" aria-label="Previous">
|
||||
@ -119,7 +125,7 @@ Fancy larger or smaller pagination? Add `.pagination-lg` or `.pagination-sm` for
|
||||
{% endexample %}
|
||||
|
||||
{% example html %}
|
||||
<nav>
|
||||
<nav aria-label="...">
|
||||
<ul class="pagination pagination-sm">
|
||||
<li class="page-item">
|
||||
<a class="page-link" href="#" aria-label="Previous">
|
||||
|
@ -334,12 +334,12 @@ To merely toggle the visibility of an element, meaning its `display` is not modi
|
||||
|
||||
Traditionally, browsers on touchscreen devices have a delay of approximately 300ms between the end of a "tap" – the moment when a finger/stylus is lifted from screen – and the [`click` event](https://developer.mozilla.org/en-US/docs/Web/Events/click) being fired. This delay is necessary for these browsers to correctly handle "double-tap to zoom" gestures without prematurely triggering actions or links after the first "tap", but it can make your site feel slightly sluggish and unresponsive.
|
||||
|
||||
Most mobile browsers automatically optimize away this 300ms delay for sites that use the `width=device-width` property as part of their [responsive meta tag]({{ site.baseurl }}/getting-started/introduction/#responsive-meta-tag) (as well as for sites that disable zooming, for instance with `user-scalable=no`, though this practice is strongly discouraged for accessibility and usability reasons). The biggest exceptions here are currently iOS Safari (and any other iOS WebView-based browser) – though this is likely to change in iOS 10, see [WebKit bug #150604](https://bugs.webkit.org/show_bug.cgi?id=150604) – and IE11 on Windows Phone 8.1.
|
||||
Most mobile browsers automatically optimize away this 300ms delay for sites that use the `width=device-width` property as part of their [responsive meta tag]({{ site.baseurl }}/getting-started/introduction/#responsive-meta-tag) (as well as for sites that disable zooming, for instance with `user-scalable=no`, though this practice is strongly discouraged for accessibility and usability reasons). The biggest exceptions here are IE11 on Windows Phone 8.1, and iOS Safari (and any other iOS WebView-based browser) [prior to iOS 9.3](https://webkit.org/blog/5610/more-responsive-tapping-on-ios/).
|
||||
|
||||
On touch-enabled laptop/desktop devices, IE11 and Microsoft Edge are currently the only browsers with "double-tap to zoom" functionality. As the [responsive meta tag]({{ site.baseurl }}/getting-started/introduction/#responsive-meta-tag) is ignored by all desktop browsers, using `width=device-width` will have no effect on the 300ms delay here.
|
||||
|
||||
To address this problem in IE11 and Microsoft Edge on desktop, as well as IE11 on Windows Phone 8.1, Bootstrap explicitly uses the [`touch-action:manipulation` CSS property](https://developer.mozilla.org/en-US/docs/Web/CSS/touch-action) on all interactive elements (such as buttons and links). This property essentially disables double-tap functionality on those elements, eliminating the 300ms delay.
|
||||
|
||||
In the case of iOS, the currently suggested approach is to use additional scripts such as [FastClick](https://github.com/ftlabs/fastclick) to explicitly work around the delay.
|
||||
In the case of old iOS versions (prior to 9.3), the suggested approach is to use additional scripts such as [FastClick](https://github.com/ftlabs/fastclick) to explicitly work around the delay.
|
||||
|
||||
For further details, see the compatibility table for [suppressing 300ms delay for touchscreen interactions](http://patrickhlauke.github.io/touch/tests/results/#suppressing-300ms-delay).
|
||||
|
@ -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;
|
||||
}
|
||||
|
2
docs/dist/css/bootstrap.css.map
vendored
2
docs/dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/css/bootstrap.min.css
vendored
2
docs/dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/css/bootstrap.min.css.map
vendored
2
docs/dist/css/bootstrap.min.css.map
vendored
File diff suppressed because one or more lines are too long
@ -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();
|
||||
}
|
||||
}, {
|
||||
|
4
docs/dist/js/bootstrap.min.js
vendored
4
docs/dist/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
8
docs/dist/js/umd/modal.js
vendored
8
docs/dist/js/umd/modal.js
vendored
@ -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();
|
||||
}
|
||||
}, {
|
||||
|
88
grunt/npm-shrinkwrap.json
generated
88
grunt/npm-shrinkwrap.json
generated
@ -164,9 +164,9 @@
|
||||
"resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz"
|
||||
},
|
||||
"autoprefixer": {
|
||||
"version": "6.3.5",
|
||||
"version": "6.3.6",
|
||||
"from": "autoprefixer@>=6.0.3 <7.0.0",
|
||||
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.3.5.tgz"
|
||||
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.3.6.tgz"
|
||||
},
|
||||
"aws-sign": {
|
||||
"version": "0.3.0",
|
||||
@ -329,9 +329,9 @@
|
||||
"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"
|
||||
},
|
||||
"browserslist": {
|
||||
"version": "1.3.0",
|
||||
"from": "browserslist@>=1.3.0 <1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.3.0.tgz"
|
||||
"version": "1.3.1",
|
||||
"from": "browserslist@>=1.3.1 <1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.3.1.tgz"
|
||||
},
|
||||
"buffer-crc32": {
|
||||
"version": "0.2.5",
|
||||
@ -366,9 +366,9 @@
|
||||
}
|
||||
},
|
||||
"caniuse-db": {
|
||||
"version": "1.0.30000444",
|
||||
"from": "caniuse-db@>=1.0.30000436 <2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000444.tgz"
|
||||
"version": "1.0.30000449",
|
||||
"from": "caniuse-db@>=1.0.30000444 <2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000449.tgz"
|
||||
},
|
||||
"caseless": {
|
||||
"version": "0.11.0",
|
||||
@ -393,9 +393,9 @@
|
||||
}
|
||||
},
|
||||
"clean-css": {
|
||||
"version": "3.4.11",
|
||||
"version": "3.4.12",
|
||||
"from": "clean-css@>=3.4.2 <3.5.0",
|
||||
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.11.tgz",
|
||||
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.12.tgz",
|
||||
"dependencies": {
|
||||
"commander": {
|
||||
"version": "2.8.1",
|
||||
@ -537,9 +537,9 @@
|
||||
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.9.tgz"
|
||||
},
|
||||
"cross-spawn-async": {
|
||||
"version": "2.1.9",
|
||||
"from": "cross-spawn-async@>=2.0.0 <3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.1.9.tgz",
|
||||
"version": "2.2.1",
|
||||
"from": "cross-spawn-async@>=2.2.0 <3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.1.tgz",
|
||||
"dependencies": {
|
||||
"lru-cache": {
|
||||
"version": "4.0.1",
|
||||
@ -1247,9 +1247,9 @@
|
||||
"resolved": "https://registry.npmjs.org/grunt-contrib-compress/-/grunt-contrib-compress-1.2.0.tgz",
|
||||
"dependencies": {
|
||||
"lodash": {
|
||||
"version": "4.7.0",
|
||||
"version": "4.10.0",
|
||||
"from": "lodash@>=4.7.0 <5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.7.0.tgz"
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.10.0.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -1303,9 +1303,9 @@
|
||||
"resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-1.0.1.tgz",
|
||||
"dependencies": {
|
||||
"lodash": {
|
||||
"version": "4.7.0",
|
||||
"version": "4.10.0",
|
||||
"from": "lodash@>=4.0.1 <5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.7.0.tgz"
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.10.0.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -1595,9 +1595,9 @@
|
||||
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
|
||||
"dependencies": {
|
||||
"repeating": {
|
||||
"version": "2.0.0",
|
||||
"version": "2.0.1",
|
||||
"from": "repeating@>=2.0.0 <3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz"
|
||||
"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -1742,9 +1742,9 @@
|
||||
"resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
|
||||
},
|
||||
"jquery": {
|
||||
"version": "2.2.2",
|
||||
"version": "2.2.3",
|
||||
"from": "jquery@>=1.9.1 <3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.2.tgz"
|
||||
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.3.tgz"
|
||||
},
|
||||
"js-base64": {
|
||||
"version": "2.1.9",
|
||||
@ -1922,9 +1922,9 @@
|
||||
"resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.2.2.tgz"
|
||||
},
|
||||
"load-grunt-tasks": {
|
||||
"version": "3.4.1",
|
||||
"version": "3.5.0",
|
||||
"from": "load-grunt-tasks@>=3.4.0 <4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-3.4.1.tgz"
|
||||
"resolved": "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-3.5.0.tgz"
|
||||
},
|
||||
"load-json-file": {
|
||||
"version": "1.1.0",
|
||||
@ -1986,6 +1986,11 @@
|
||||
"from": "lodash._baseindexof@>=3.0.0 <4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz"
|
||||
},
|
||||
"lodash._baseslice": {
|
||||
"version": "4.0.0",
|
||||
"from": "lodash._baseslice@>=4.0.0 <4.1.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash._baseslice/-/lodash._baseslice-4.0.0.tgz"
|
||||
},
|
||||
"lodash._bindcallback": {
|
||||
"version": "3.0.1",
|
||||
"from": "lodash._bindcallback@>=3.0.0 <4.0.0",
|
||||
@ -2052,9 +2057,9 @@
|
||||
"resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz"
|
||||
},
|
||||
"lodash.istypedarray": {
|
||||
"version": "3.0.5",
|
||||
"version": "3.0.6",
|
||||
"from": "lodash.istypedarray@>=3.0.0 <4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.5.tgz"
|
||||
"resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz"
|
||||
},
|
||||
"lodash.keys": {
|
||||
"version": "3.1.2",
|
||||
@ -2077,30 +2082,25 @@
|
||||
"resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-3.1.0.tgz"
|
||||
},
|
||||
"lodash.pad": {
|
||||
"version": "4.1.0",
|
||||
"version": "4.3.0",
|
||||
"from": "lodash.pad@>=4.1.0 <5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.1.0.tgz"
|
||||
"resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.3.0.tgz"
|
||||
},
|
||||
"lodash.padend": {
|
||||
"version": "4.2.0",
|
||||
"version": "4.4.0",
|
||||
"from": "lodash.padend@>=4.1.0 <5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.2.0.tgz"
|
||||
"resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.4.0.tgz"
|
||||
},
|
||||
"lodash.padstart": {
|
||||
"version": "4.2.0",
|
||||
"version": "4.4.0",
|
||||
"from": "lodash.padstart@>=4.1.0 <5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.2.0.tgz"
|
||||
"resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.4.0.tgz"
|
||||
},
|
||||
"lodash.pick": {
|
||||
"version": "3.1.0",
|
||||
"from": "lodash.pick@>=3.1.0 <4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-3.1.0.tgz"
|
||||
},
|
||||
"lodash.repeat": {
|
||||
"version": "4.0.0",
|
||||
"from": "lodash.repeat@>=4.0.0 <5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-4.0.0.tgz"
|
||||
},
|
||||
"lodash.restparam": {
|
||||
"version": "3.6.1",
|
||||
"from": "lodash.restparam@>=3.0.0 <4.0.0",
|
||||
@ -2286,9 +2286,9 @@
|
||||
"resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.4.2.tgz",
|
||||
"dependencies": {
|
||||
"cross-spawn": {
|
||||
"version": "2.1.5",
|
||||
"version": "2.2.2",
|
||||
"from": "cross-spawn@>=2.0.0 <3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-2.1.5.tgz"
|
||||
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-2.2.2.tgz"
|
||||
},
|
||||
"gaze": {
|
||||
"version": "0.5.2",
|
||||
@ -2573,9 +2573,9 @@
|
||||
"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
|
||||
},
|
||||
"pinkie-promise": {
|
||||
"version": "2.0.0",
|
||||
"version": "2.0.1",
|
||||
"from": "pinkie-promise@>=2.0.0 <3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz"
|
||||
"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
|
||||
},
|
||||
"pkg-up": {
|
||||
"version": "1.0.0",
|
||||
@ -2977,9 +2977,9 @@
|
||||
"resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"
|
||||
},
|
||||
"lodash": {
|
||||
"version": "4.7.0",
|
||||
"version": "4.10.0",
|
||||
"from": "lodash@>=4.0.0 <5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.7.0.tgz"
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.10.0.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -3237,9 +3237,9 @@
|
||||
"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz"
|
||||
},
|
||||
"spdx-license-ids": {
|
||||
"version": "1.2.0",
|
||||
"version": "1.2.1",
|
||||
"from": "spdx-license-ids@>=1.0.2 <2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.0.tgz"
|
||||
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.1.tgz"
|
||||
},
|
||||
"split": {
|
||||
"version": "0.3.3",
|
||||
|
8
js/dist/modal.js
vendored
8
js/dist/modal.js
vendored
@ -410,13 +410,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();
|
||||
}
|
||||
}, {
|
||||
|
2
js/dist/modal.js.map
vendored
2
js/dist/modal.js.map
vendored
File diff suppressed because one or more lines are too long
@ -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()
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
|
@ -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.
|
||||
|
@ -86,7 +86,7 @@
|
||||
|
||||
.navbar-divider {
|
||||
float: left;
|
||||
width: 1px;
|
||||
width: $border-width;
|
||||
padding-top: .425rem;
|
||||
padding-bottom: .425rem;
|
||||
margin-right: $navbar-padding-x;
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Only display content to screen readers
|
||||
//
|
||||
// See: http://a11yproject.com/posts/how-to-hide-content/
|
||||
// See: http://a11yproject.com/posts/how-to-hide-content
|
||||
|
||||
@mixin sr-only {
|
||||
position: absolute;
|
||||
|
Loading…
x
Reference in New Issue
Block a user