Loads of small fixes to Base and Reindeer themes: contains bugfixes for issues found during developing the new Reindeer theme demo, plus a couple of new styles for Reindeer.

svn changeset:12389/svn branch:6.3

1 files changed, 83 insertions, 36 deletions

diff --git a/WebContent/VAADIN/themes/reindeer/label/label.css b/WebContent/VAADIN/themes/reindeer/label/label.css
index 9b71179088..905ed7251d 100644
--- a/WebContent/VAADIN/themes/reindeer/label/label.css
+++ b/WebContent/VAADIN/themes/reindeer/label/label.css
@@ -1,10 +1,84 @@
 .v-label {
 	line-height: 18px;
 }
+
+/**********************
+ * Black styles
+ **********************/
+.white .black,
+.blue .black {
+	color: #C9CCCE;
+	text-shadow: 0 0 1px #000;
+}
+.black .v-label-h1,
+.black .v-label-h2,
+.black .v-caption-h1,
+.black .v-caption-h2,
+.white .black .v-label-h1,
+.white .black .v-label-h2,
+.white .black .v-caption-h1,
+.white .black .v-caption-h2,
+.blue .black .v-label-h1,
+.blue .black .v-label-h2,
+.blue .black .v-caption-h1,
+.blue .black .v-caption-h2 {
+	color: #fff;
+	text-shadow: rgba(0,0,0,.8) 0 2px 2px;
+}
+.black .v-label-light,
+.white .black .v-label-light {
+	color: #72787c;
+}
+.black .v-label hr,
+.white .black .v-label hr {
+	background: #0c0d0e;
+	color: #0c0d0e;
+	border-bottom-color: #292b2e;
+}
+
+/**********************
+ * Blue styles
+ **********************/
+.v-app .white,
+.v-window .white,
+.v-app .blue,
+.v-window .blue {
+	color: #222;
+	text-shadow: none;
+}
+.blue .v-label-h1,
+.blue .v-label-h2,
+.blue .v-caption-h1,
+.blue .v-caption-h2,
+.white .blue .v-label-h1,
+.white .blue .v-label-h2,
+.white .blue .v-caption-h1,
+.white .blue .v-caption-h2 {
+	color: #fff;
+	text-shadow: rgba(0,0,0,.3) 0 1px 1px;
+}
+.blue .v-label-light,
+.white .blue .v-label-light {
+	color: #6e7c83;
+}
+.blue .v-label hr,
+.white .blue .v-label hr {
+	background: #a3bcc9;
+	color: #a3bcc9;
+	border-bottom-color: #cfe2eb;
+}
+
+/**********************
+ * Default & white styles
+ **********************/
 .v-label-h1,
 .v-label-h2,
 .v-caption-h1,
-.v-caption-h2 {
+.v-caption-h2,
+.white .v-label-h1,
+.white .v-label-h2,
+.white .v-caption-h1,
+.white .v-caption-h2 {
 	font-family: Helvetica, Arial, "Lucida Grande", Geneva, Tahoma, Verdana, sans-serif;
 	font-size: 24px;
 	line-height: 30px;
@@ -14,39 +88,21 @@
 	text-shadow: #fff 0 -1px 1px;
 }
 .v-label-h2,
-.v-caption-h2 {
+.v-caption-h2,
+.white .v-label-h2,
+.white .v-caption-h2 {
 	font-size: 16px;
 	line-height: 22px;
 }
-.v-label-light {
+.v-label-light,
+.white .v-label-light {
 	font-size: 11px;
 	line-height: 13px;
 	color: #707070;
 }
 
-.blue .v-label-h1,
-.blue .v-label-h2,
-.blue .v-caption-h1,
-.blue .v-caption-h2 {
-	color: #fff;
-	text-shadow: rgba(0,0,0,.3) 0 1px 1px;
-}
-.blue .v-label-light {
-	color: #6e7c83;
-}
-
-.black .v-label-h1,
-.black .v-label-h2,
-.black .v-caption-h1,
-.black .v-caption-h2 {
-	color: #fff;
-	text-shadow: rgba(0,0,0,.8) 0 2px 2px;
-}
-.black .v-label-light {
-	color: #72787c;
-}
-
-.v-label hr {
+.v-label hr,
+.white .v-label hr {
 	height: 2px;
 	overflow: hidden;
 	background: #dcdcdc;
@@ -54,20 +110,11 @@
 	border: none;
 	border-bottom: 1px solid #fff;
 }
+
 .v-sa .v-label hr,
 .v-ie8 .v-label hr {
 	height: 1px;
 }
-.blue .v-label hr {
-	background: #a3bcc9;
-	color: #a3bcc9;
-	border-bottom-color: #cfe2eb;
-}
-.black .v-label hr {
-	background: #0c0d0e;
-	color: #0c0d0e;
-	border-bottom-color: #292b2e;
-}
 
 /* Labels inside Table don't need a line-height */
 .v-table .v-label {