merge from dev

2016-01-14 12:04:42 -05:00 · 2016-01-14 12:04:42 -05:00 · bcfee41a57
commit bcfee41a57
parent d96250df7f
318 changed files with 54424 additions and 6419 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;
+}