Skip to content

Commit 6d20d14

Browse files
committed
Merge branch 'master' into data-naming
2 parents 59f2e88 + 09732da commit 6d20d14

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1683
-1554
lines changed

demos/accordion/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ <h4>Examples</h4>
1414
<li><a href="fillspace.html">Fill space</a></li>
1515
<li><a href="no-auto-height.html">No auto height</a></li>
1616
<li><a href="collapsible.html">Collapse content</a></li>
17-
<li><a href="mouseover.html">Open on mouseover</a></li>
1817
<li><a href="hoverintent.html">Open on hoverintent</a></li>
1918
<li><a href="custom-icons.html">Customize icons</a></li>
2019
<li><a href="sortable.html">Sortable</a></li>

demos/accordion/mouseover.html

Lines changed: 0 additions & 57 deletions
This file was deleted.

external/qunit.css

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/**
2-
* QUnit - A JavaScript Unit Testing Framework
2+
* QUnit v1.4.0pre - A JavaScript Unit Testing Framework
33
*
44
* http://docs.jquery.com/QUnit
55
*
6-
* Copyright (c) 2011 John Resig, Jörn Zaefferer
6+
* Copyright (c) 2012 John Resig, Jörn Zaefferer
77
* Dual licensed under the MIT (MIT-LICENSE.txt)
88
* or GPL (GPL-LICENSE.txt) licenses.
99
*/
@@ -54,6 +54,10 @@
5454
color: #fff;
5555
}
5656

57+
#qunit-header label {
58+
display: inline-block;
59+
}
60+
5761
#qunit-banner {
5862
height: 5px;
5963
}
@@ -186,6 +190,7 @@
186190
color: #710909;
187191
background-color: #fff;
188192
border-left: 26px solid #EE5757;
193+
white-space: pre;
189194
}
190195

191196
#qunit-tests > li:last-child {
@@ -222,4 +227,6 @@
222227
position: absolute;
223228
top: -10000px;
224229
left: -10000px;
230+
width: 1000px;
231+
height: 1000px;
225232
}

0 commit comments

Comments
 (0)