diff --git a/package.json b/package.json
index 64a5ad7cb..c95865bcb 100644
--- a/package.json
+++ b/package.json
@@ -44,8 +44,8 @@
"lodash": "4.11.2",
"markdown-doctest": "^0.8.0",
"platform": "^1.3.1",
- "qunit-extras": "^2.0.0",
- "qunitjs": "~1.23.1",
+ "qunit-extras": "^2.0.1",
+ "qunitjs": "^2.0.0",
"request": "^2.69.0",
"requirejs": "^2.2.0",
"sauce-tunnel": "^2.5.0",
diff --git a/perf/index.html b/perf/index.html
index 16d41bf36..305cdce70 100644
--- a/perf/index.html
+++ b/perf/index.html
@@ -10,16 +10,27 @@
height: 100%;
}
#FirebugUI {
- top: 2em;
+ top: 2.5em;
}
#perf-toolbar {
background-color: #EEE;
color: #5E740B;
font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
font-size: small;
- padding: 0.5em 0 0.5em 2em;
+ padding: 0.5em 1em 0.5em 1em;
overflow: hidden;
}
+ #perf-toolbar label {
+ display: inline-block;
+ margin-right: 0.5em;
+ }
+ #perf-toolbar span {
+ display: inline-block;
+ float: right;
+ line-height: 2.1em;
+ margin-left: 1em;
+ margin-top: 0;
+ }
diff --git a/test/asset/test-ui.js b/test/asset/test-ui.js
index 24f087a48..39694ad18 100644
--- a/test/asset/test-ui.js
+++ b/test/asset/test-ui.js
@@ -59,8 +59,8 @@
setTimeout(init, 15);
return;
}
- toolbar.appendChild(span1);
- toolbar.appendChild(span2);
+ toolbar.insertBefore(span2, toolbar.lastChild);
+ toolbar.insertBefore(span1, span2);
buildList.selectedIndex = (function() {
switch (build) {
@@ -89,7 +89,6 @@
}
var span1 = document.createElement('span');
- span1.style.cssText = 'float:right';
span1.innerHTML =
'' +
'';
var span2 = document.createElement('span');
- span2.style.cssText = 'float:right';
span2.innerHTML =
'' +
'';
+ span1.style.cssText =
+ span2.style.cssText = 'display:inline-block;float:right;line-height:2.1em;margin-left:1em;margin-top:0;';
+
+ span1.firstChild.style.cssText =
+ span2.firstChild.style.cssText = 'display:inline-block;margin-right:.5em;';
+
var buildList = span1.lastChild,
loaderList = span2.lastChild;
diff --git a/test/test-fp.js b/test/test-fp.js
index 710f02950..4a86c8154 100644
--- a/test/test-fp.js
+++ b/test/test-fp.js
@@ -2268,5 +2268,6 @@
if (!document) {
QUnit.config.noglobals = true;
QUnit.load();
+ QUnit.start();
}
}.call(this));
diff --git a/test/test.js b/test/test.js
index 8322d80e6..fe2d6640c 100644
--- a/test/test.js
+++ b/test/test.js
@@ -26785,5 +26785,6 @@
if (!document) {
QUnit.config.noglobals = true;
QUnit.load();
+ QUnit.start();
}
}.call(this));