aboutsummaryrefslogtreecommitdiff
path: root/js/tests/index.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-01-18 14:11:55 -0800
committerMark Otto <[email protected]>2014-01-18 14:11:55 -0800
commitcd1bea0616a8fb1b94d8021bc8dbc0cbc2eaf4aa (patch)
tree0c0a716f3f567c7bd17fb9f6fb254100d78d0e18 /js/tests/index.html
parentb121207e10ad20e6d1d8dc269f71697ad26a67e6 (diff)
parentb1721f42cc8298fb691530614ee6d52389872e25 (diff)
downloadbootstrap-cd1bea0616a8fb1b94d8021bc8dbc0cbc2eaf4aa.tar.xz
bootstrap-cd1bea0616a8fb1b94d8021bc8dbc0cbc2eaf4aa.zip
Merge branch 'master' into bg-variant
Diffstat (limited to 'js/tests/index.html')
-rw-r--r--js/tests/index.html7
1 files changed, 2 insertions, 5 deletions
diff --git a/js/tests/index.html b/js/tests/index.html
index 2983a0042..8c6e858e4 100644
--- a/js/tests/index.html
+++ b/js/tests/index.html
@@ -17,7 +17,7 @@
</script>
<!-- plugin sources -->
- <script src="../../js/transition.js"></script>
+ <script>$.support.transition = false</script>
<script src="../../js/alert.js"></script>
<script src="../../js/button.js"></script>
<script src="../../js/carousel.js"></script>
@@ -47,10 +47,7 @@
</head>
<body>
<div>
- <h1 id="qunit-header">Bootstrap Plugin Test Suite</h1>
- <h2 id="qunit-banner"></h2>
- <h2 id="qunit-userAgent"></h2>
- <ol id="qunit-tests"></ol>
+ <div id="qunit"></div>
<div id="qunit-fixture"></div>
</div>
</body>