aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-05-30 23:31:40 -0700
committerMark Otto <[email protected]>2017-05-30 23:31:40 -0700
commit2fd192968dadc0f8d1d22a6f48c208aacd79e71f (patch)
treed029a8d11816751496292de096438004b0d82627 /js
parentf8d1dc4d04fa341c2900de9a2ea01f3ecd8753b2 (diff)
parentccd86bdc967d8714f718c55bd13db967f2e849d2 (diff)
downloadbootstrap-2fd192968dadc0f8d1d22a6f48c208aacd79e71f.tar.xz
bootstrap-2fd192968dadc0f8d1d22a6f48c208aacd79e71f.zip
Merge branch 'v4-dev' into v4-docs-streamlined
Diffstat (limited to 'js')
-rw-r--r--js/tests/vendor/qunit.css8
-rw-r--r--js/tests/vendor/qunit.js12
2 files changed, 10 insertions, 10 deletions
diff --git a/js/tests/vendor/qunit.css b/js/tests/vendor/qunit.css
index 90e1269f1..75d8b6279 100644
--- a/js/tests/vendor/qunit.css
+++ b/js/tests/vendor/qunit.css
@@ -1,12 +1,12 @@
/*!
- * QUnit 2.2.0
+ * QUnit 2.3.2
* https://qunitjs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
- * Date: 2017-03-11T16:19Z
+ * Date: 2017-04-18T02:19Z
*/
/** Font Family and Sizes */
@@ -236,7 +236,7 @@
}
#qunit-tests.hidepass li.running,
-#qunit-tests.hidepass li.pass {
+#qunit-tests.hidepass li.pass:not(.todo) {
visibility: hidden;
position: absolute;
width: 0;
@@ -433,4 +433,4 @@
left: -10000px;
width: 1000px;
height: 1000px;
-}
+} \ No newline at end of file
diff --git a/js/tests/vendor/qunit.js b/js/tests/vendor/qunit.js
index b399f417c..fa728db5b 100644
--- a/js/tests/vendor/qunit.js
+++ b/js/tests/vendor/qunit.js
@@ -1,12 +1,12 @@
/*!
- * QUnit 2.2.0
+ * QUnit 2.3.2
* https://qunitjs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
- * Date: 2017-03-11T16:19Z
+ * Date: 2017-04-18T02:19Z
*/
(function (global$1) {
'use strict';
@@ -21,12 +21,12 @@
var document = window && window.document;
var navigator = window && window.navigator;
- var sessionStorage = function () {
+ var localSessionStorage = function () {
var x = "qunit-test-string";
try {
- sessionStorage.setItem(x, x);
- sessionStorage.removeItem(x);
- return sessionStorage;
+ global$1.sessionStorage.setItem(x, x);
+ global$1.sessionStorage.removeItem(x);
+ return global$1.sessionStorage;
} catch (e) {
return undefined;
}