Skip to content

Commit cf9dc4e

Browse files
committed
Update sauce et.al.
1 parent 6532f71 commit cf9dc4e

File tree

6 files changed

+1483
-1383
lines changed

6 files changed

+1483
-1383
lines changed

Gruntfile.coffee

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@ module.exports = (grunt) ->
2424
" * Copyright (c) <%= grunt.template.today('yyyy') %> <%= pkg.author.name %>;" +
2525
" Licensed <%= _.pluck(pkg.licenses, 'type').join(', ') %> */\n"
2626

27-
# bumpup:
28-
# options:
29-
# dateformat: "YYYY-MM-DD HH:mm"
30-
# normalize: true
31-
# updateProps:
32-
# pkg: "package.json"
33-
# files: ["package.json", "bower.json", "fancytree.jquery.json"]
34-
3527
checkrepo:
3628
beforeBump:
3729
tag:
@@ -268,9 +260,10 @@ module.exports = (grunt) ->
268260
all:
269261
options:
270262
urls: ["http://localhost:9999/test/unit/test-core.html"]
271-
tunnelTimeout: 5
263+
# tunnelTimeout: 5
272264
build: process.env.TRAVIS_JOB_ID
273-
concurrency: 3
265+
# concurrency: 3
266+
throttled: 10
274267
browsers: [
275268
{ browserName: "chrome", platform: "Windows 7" }
276269
{ browserName: "firefox", platform: "Windows 7" }
@@ -286,13 +279,6 @@ module.exports = (grunt) ->
286279
]
287280
testname: "fancytree qunit tests"
288281

289-
# tagrelease:
290-
# file: "package.json"
291-
# commit: true
292-
# message: "Tagging the %version% release."
293-
# prefix: "v"
294-
# annotate: true
295-
296282
uglify:
297283
# build:
298284
# options:

lib/qunit.css

Lines changed: 37 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
/**
2-
* QUnit v1.11.0 - A JavaScript Unit Testing Framework
1+
/*!
2+
* QUnit 1.14.0
3+
* http://qunitjs.com/
34
*
4-
* http://qunitjs.com
5-
*
6-
* Copyright 2012 jQuery Foundation and other contributors
7-
* Released under the MIT license.
5+
* Copyright 2013 jQuery Foundation and other contributors
6+
* Released under the MIT license
87
* http://jquery.org/license
8+
*
9+
* Date: 2014-01-31T16:40Z
910
*/
1011

1112
/** Font Family and Sizes */
@@ -31,32 +32,29 @@
3132
#qunit-header {
3233
padding: 0.5em 0 0.5em 1em;
3334

34-
color: #8699a4;
35-
background-color: #0d3349;
35+
color: #8699A4;
36+
background-color: #0D3349;
3637

3738
font-size: 1.5em;
3839
line-height: 1em;
39-
font-weight: normal;
40+
font-weight: 400;
4041

4142
border-radius: 5px 5px 0 0;
42-
-moz-border-radius: 5px 5px 0 0;
43-
-webkit-border-top-right-radius: 5px;
44-
-webkit-border-top-left-radius: 5px;
4543
}
4644

4745
#qunit-header a {
4846
text-decoration: none;
49-
color: #c2ccd1;
47+
color: #C2CCD1;
5048
}
5149

5250
#qunit-header a:hover,
5351
#qunit-header a:focus {
54-
color: #fff;
52+
color: #FFF;
5553
}
5654

5755
#qunit-testrunner-toolbar label {
5856
display: inline-block;
59-
padding: 0 .5em 0 .1em;
57+
padding: 0 0.5em 0 0.1em;
6058
}
6159

6260
#qunit-banner {
@@ -66,14 +64,14 @@
6664
#qunit-testrunner-toolbar {
6765
padding: 0.5em 0 0.5em 2em;
6866
color: #5E740B;
69-
background-color: #eee;
67+
background-color: #EEE;
7068
overflow: hidden;
7169
}
7270

7371
#qunit-userAgent {
7472
padding: 0.5em 0 0.5em 2.5em;
75-
background-color: #2b81af;
76-
color: #fff;
73+
background-color: #2B81AF;
74+
color: #FFF;
7775
text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
7876
}
7977

@@ -89,7 +87,7 @@
8987

9088
#qunit-tests li {
9189
padding: 0.4em 0.5em 0.4em 2.5em;
92-
border-bottom: 1px solid #fff;
90+
border-bottom: 1px solid #FFF;
9391
list-style-position: inside;
9492
}
9593

@@ -103,7 +101,7 @@
103101

104102
#qunit-tests li a {
105103
padding: 0.5em;
106-
color: #c2ccd1;
104+
color: #C2CCD1;
107105
text-decoration: none;
108106
}
109107
#qunit-tests li a:hover,
@@ -120,11 +118,9 @@
120118
margin-top: 0.5em;
121119
padding: 0.5em;
122120

123-
background-color: #fff;
121+
background-color: #FFF;
124122

125123
border-radius: 5px;
126-
-moz-border-radius: 5px;
127-
-webkit-border-radius: 5px;
128124
}
129125

130126
.qunit-collapsed {
@@ -133,13 +129,13 @@
133129

134130
#qunit-tests table {
135131
border-collapse: collapse;
136-
margin-top: .2em;
132+
margin-top: 0.2em;
137133
}
138134

139135
#qunit-tests th {
140136
text-align: right;
141137
vertical-align: top;
142-
padding: 0 .5em 0 0;
138+
padding: 0 0.5em 0 0;
143139
}
144140

145141
#qunit-tests td {
@@ -153,68 +149,65 @@
153149
}
154150

155151
#qunit-tests del {
156-
background-color: #e0f2be;
157-
color: #374e0c;
152+
background-color: #E0F2BE;
153+
color: #374E0C;
158154
text-decoration: none;
159155
}
160156

161157
#qunit-tests ins {
162-
background-color: #ffcaca;
158+
background-color: #FFCACA;
163159
color: #500;
164160
text-decoration: none;
165161
}
166162

167163
/*** Test Counts */
168164

169-
#qunit-tests b.counts { color: black; }
165+
#qunit-tests b.counts { color: #000; }
170166
#qunit-tests b.passed { color: #5E740B; }
171167
#qunit-tests b.failed { color: #710909; }
172168

173169
#qunit-tests li li {
174170
padding: 5px;
175-
background-color: #fff;
171+
background-color: #FFF;
176172
border-bottom: none;
177173
list-style-position: inside;
178174
}
179175

180176
/*** Passing Styles */
181177

182178
#qunit-tests li li.pass {
183-
color: #3c510c;
184-
background-color: #fff;
179+
color: #3C510C;
180+
background-color: #FFF;
185181
border-left: 10px solid #C6E746;
186182
}
187183

188184
#qunit-tests .pass { color: #528CE0; background-color: #D2E0E6; }
189185
#qunit-tests .pass .test-name { color: #366097; }
190186

191187
#qunit-tests .pass .test-actual,
192-
#qunit-tests .pass .test-expected { color: #999999; }
188+
#qunit-tests .pass .test-expected { color: #999; }
193189

194190
#qunit-banner.qunit-pass { background-color: #C6E746; }
195191

196192
/*** Failing Styles */
197193

198194
#qunit-tests li li.fail {
199195
color: #710909;
200-
background-color: #fff;
196+
background-color: #FFF;
201197
border-left: 10px solid #EE5757;
202198
white-space: pre;
203199
}
204200

205201
#qunit-tests > li:last-child {
206202
border-radius: 0 0 5px 5px;
207-
-moz-border-radius: 0 0 5px 5px;
208-
-webkit-border-bottom-right-radius: 5px;
209-
-webkit-border-bottom-left-radius: 5px;
210203
}
211204

212-
#qunit-tests .fail { color: #000000; background-color: #EE5757; }
205+
#qunit-tests .fail { color: #000; background-color: #EE5757; }
213206
#qunit-tests .fail .test-name,
214-
#qunit-tests .fail .module-name { color: #000000; }
207+
#qunit-tests .fail .module-name { color: #000; }
215208

216209
#qunit-tests .fail .test-actual { color: #EE5757; }
217-
#qunit-tests .fail .test-expected { color: green; }
210+
#qunit-tests .fail .test-expected { color: #008000; }
218211

219212
#qunit-banner.qunit-fail { background-color: #EE5757; }
220213

@@ -224,13 +217,13 @@
224217
#qunit-testresult {
225218
padding: 0.5em 0.5em 0.5em 2.5em;
226219

227-
color: #2b81af;
220+
color: #2B81AF;
228221
background-color: #D2E0E6;
229222

230-
border-bottom: 1px solid white;
223+
border-bottom: 1px solid #FFF;
231224
}
232225
#qunit-testresult .module-name {
233-
font-weight: bold;
226+
font-weight: 700;
234227
}
235228

236229
/** Fixture */
@@ -241,4 +234,4 @@
241234
left: -10000px;
242235
width: 1000px;
243236
height: 1000px;
244-
}
237+
}

0 commit comments

Comments
 (0)