Small fixes to themes:

Reindeer theme: labels inside table no longer have a specified line-height.

Base theme: tree item icons and captions are now vertically aligned.

svn changeset:8311/svn branch:6.0

9 files changed, 26 insertions, 0 deletions

diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index 6aa2b0971c..368be3090c 100644
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -1398,6 +1398,10 @@ div.v-tree-node-leaf {
 .v-tree-node-caption div {
 	white-space: nowrap;
 }
+.v-tree-node-caption span,
+.v-tree-node-caption .v-icon {
+	vertical-align: middle;
+}
 .v-tree-node-selected span {
 	background: #999;
 	color: #fff;
diff --git a/WebContent/VAADIN/themes/base/tree/tree.css b/WebContent/VAADIN/themes/base/tree/tree.css
index 753482190c..21e41d74a0 100644
--- a/WebContent/VAADIN/themes/base/tree/tree.css
+++ b/WebContent/VAADIN/themes/base/tree/tree.css
@@ -20,6 +20,10 @@ div.v-tree-node-leaf {
 .v-tree-node-caption div {
 	white-space: nowrap;
 }
+.v-tree-node-caption span,
+.v-tree-node-caption .v-icon {
+	vertical-align: middle;
+}
 .v-tree-node-selected span {
 	background: #999;
 	color: #fff;
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png
index 295237a5fd..9f7f7c4659 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png
index 29dedde200..87af82f1c9 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png
diff --git a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png
index f8eb2af29f..533ac3d3c3 100644
--- a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png
+++ b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png
diff --git a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png
index 028218a6ab..c4ee4bdcd1 100644
--- a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png
+++ b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png
diff --git a/WebContent/VAADIN/themes/reindeer/label/label.css b/WebContent/VAADIN/themes/reindeer/label/label.css
index 7cd77ff5b8..9353f95ac0 100644
--- a/WebContent/VAADIN/themes/reindeer/label/label.css
+++ b/WebContent/VAADIN/themes/reindeer/label/label.css
@@ -59,4 +59,9 @@
 .black .v-label hr {
 	background: #0c0d0e;
 	border-bottom-color: #292b2e;
+}
+
+/* Labels inside Table don't need a line-height */
+.v-table .v-label {
+	line-height: normal;
 }
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index c67dce45db..73a717b010 100644
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -1398,6 +1398,10 @@ div.v-tree-node-leaf {
 .v-tree-node-caption div {
 	white-space: nowrap;
 }
+.v-tree-node-caption span,
+.v-tree-node-caption .v-icon {
+	vertical-align: middle;
+}
 .v-tree-node-selected span {
 	background: #999;
 	color: #fff;
@@ -2830,6 +2834,11 @@ td.v-datefield-calendarpanel-nextyear {
 	border-bottom-color: #292b2e;
 }
 
+/* Labels inside Table don't need a line-height */
+.v-table .v-label {
+	line-height: normal;
+}
+
 /* ./WebContent/VAADIN/themes/reindeer/layouts/layouts.css */
 .v-orderedlayout-margin-top,
 .v-horizontallayout-margin-top,
diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index 013ad7b093..5d0cc62c8e 100644
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -1398,6 +1398,10 @@ div.v-tree-node-leaf {
 .v-tree-node-caption div {
 	white-space: nowrap;
 }
+.v-tree-node-caption span,
+.v-tree-node-caption .v-icon {
+	vertical-align: middle;
+}
 .v-tree-node-selected span {
 	background: #999;
 	color: #fff;