merge from dev

2016-01-12 14:55:45 -05:00 · 2016-01-12 14:55:45 -05:00 · 189942e289
commit 189942e289
parent 9e1a2cf66a
298 changed files with 53049 additions and 5413 deletions
--- a/dashboard-ui/bower_components/jquery/test/integration/data/gh-1764-fullscreen-iframe.css
+++ b/dashboard-ui/bower_components/jquery/test/integration/data/gh-1764-fullscreen-iframe.css
@ -0,0 +1,18 @@
+.result {
+	font-size: 24px;
+	margin: 0.5em 0;
+	width: 700px;
+	height: 56px;
+}
+
+.error {
+	background-color: red;
+}
+
+.warn {
+	background-color: yellow;
+}
+
+.success {
+	background-color: lightgreen;
+}