merged [9471] from 6.1

svn changeset:9472/svn branch:6.2

diff --git a/WebContent/VAADIN/themes/reindeer/common/common.css b/WebContent/VAADIN/themes/reindeer/common/common.css
index 09d22f35bbdc71512b787f0e7ad32d8a6cba9112..731e0eaf1bdbbbfc69b34f56b7fd0adb808b1be8 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/common/common.css
+++ b/WebContent/VAADIN/themes/reindeer/common/common.css
@@ -73,7 +73,6 @@
        background-color: #fffcdd;
        border: 1px solid #b8b295;
        font-size: 11px;
-       line-height: 13px;
        color: #222;
 }
 .v-tooltip-text {

diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index 65e64a0724c70abe6c6f23fa4a132ab6c9d2a165..e2f782424debfc5f94a80a618c06db432f95df66 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -2304,7 +2304,6 @@ div.v-tree-node-leaf {
        background-color: #fffcdd;
        border: 1px solid #b8b295;
        font-size: 11px;
-       line-height: 13px;
        color: #222;
 }
 .v-tooltip-text {

diff --git a/WebContent/VAADIN/themes/runo/common/common.css b/WebContent/VAADIN/themes/runo/common/common.css
index 7b40130c45c2b690cd64ff421b0f7027f533633c..7b8317c4f3a78a84561f6ab206707f8c6b528e11 100644 (file)
--- a/WebContent/VAADIN/themes/runo/common/common.css
+++ b/WebContent/VAADIN/themes/runo/common/common.css
@@ -38,7 +38,6 @@
        border-top-color: #d5d2c1;
        border-left-color: #d5d2c1;
        font-size: 11px;
-       line-height: 13px;
        font-family: arial, helvetica, tahoma, verdana, sans-serif;
        color: #5d5444;
 }

diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index 94d2f81d33dd7834f1a8a1407709ddf6a4cb95e5..88e08840e118150ce141246a40e289140151a0af 100644 (file)
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -1847,7 +1847,6 @@ div.v-tree-node-leaf {
        border-top-color: #d5d2c1;
        border-left-color: #d5d2c1;
        font-size: 11px;
-       line-height: 13px;
        font-family: arial, helvetica, tahoma, verdana, sans-serif;
        color: #5d5444;
 }