aboutsummaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes
diff options
context:
space:
mode:
authorJouni Koivuviita <jouni.koivuviita@itmill.com>2009-12-14 08:47:53 +0000
committerJouni Koivuviita <jouni.koivuviita@itmill.com>2009-12-14 08:47:53 +0000
commitf25600a6201ff61afc8b895e13b631f6887b6045 (patch)
tree1e669320da1dfebde8f513dd9c4fd2156b4a5206 /WebContent/VAADIN/themes
parentdca90d6e1683973332c31b685679d29eea7ff18f (diff)
downloadvaadin-framework-f25600a6201ff61afc8b895e13b631f6887b6045.tar.gz
vaadin-framework-f25600a6201ff61afc8b895e13b631f6887b6045.zip
Fixes #3848: Rich text sample is cut in IE
* H1-6 elements need line-height: normal; svn changeset:10270/svn branch:6.2
Diffstat (limited to 'WebContent/VAADIN/themes')
-rw-r--r--WebContent/VAADIN/themes/base/common/common.css9
-rw-r--r--WebContent/VAADIN/themes/base/styles.css11
-rw-r--r--WebContent/VAADIN/themes/reindeer/styles.css11
-rw-r--r--WebContent/VAADIN/themes/runo/styles.css11
4 files changed, 42 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css
index c7d908b6c8..48091fc35e 100644
--- a/WebContent/VAADIN/themes/base/common/common.css
+++ b/WebContent/VAADIN/themes/base/common/common.css
@@ -149,6 +149,15 @@ div.v-app-loading {
.v-label-undef-w {
white-space: nowrap;
}
+/* Revert line-height for heading elements inside labels */
+.v-label h1,
+.v-label h2,
+.v-label h3,
+.v-label h4,
+.v-label h5,
+.v-label h6 {
+ line-height: normal;
+}
/* Loading indicator states
* Note: client side expects that loading indicator has a height. It depends on
* this css property to ensure browsers have applied all required styles.
diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index 3cff7044e1..2adc16e87a 100644
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -1,3 +1,5 @@
+.v-theme-version:after {content:"9_9_9_INTERNAL-DEBUG-BUILD";}
+.v-theme-version-9_9_9_INTERNAL-DEBUG-BUILD {display: none;}
/* Automatically compiled css file from subdirectories. */
.v-absolutelayout-wrapper {
@@ -373,6 +375,15 @@ div.v-app-loading {
.v-label-undef-w {
white-space: nowrap;
}
+/* Revert line-height for heading elements inside labels */
+.v-label h1,
+.v-label h2,
+.v-label h3,
+.v-label h4,
+.v-label h5,
+.v-label h6 {
+ line-height: normal;
+}
/* Loading indicator states
* Note: client side expects that loading indicator has a height. It depends on
* this css property to ensure browsers have applied all required styles.
diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index 4b90e268fd..7822f9be80 100644
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -1,3 +1,5 @@
+.v-theme-version:after {content:"9_9_9_INTERNAL-DEBUG-BUILD";}
+.v-theme-version-9_9_9_INTERNAL-DEBUG-BUILD {display: none;}
/* Automatically compiled css file from subdirectories. */
.v-absolutelayout-wrapper {
@@ -373,6 +375,15 @@ div.v-app-loading {
.v-label-undef-w {
white-space: nowrap;
}
+/* Revert line-height for heading elements inside labels */
+.v-label h1,
+.v-label h2,
+.v-label h3,
+.v-label h4,
+.v-label h5,
+.v-label h6 {
+ line-height: normal;
+}
/* Loading indicator states
* Note: client side expects that loading indicator has a height. It depends on
* this css property to ensure browsers have applied all required styles.
diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index de9510eb2e..2104e3bb00 100644
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -1,3 +1,5 @@
+.v-theme-version:after {content:"9_9_9_INTERNAL-DEBUG-BUILD";}
+.v-theme-version-9_9_9_INTERNAL-DEBUG-BUILD {display: none;}
/* Automatically compiled css file from subdirectories. */
.v-absolutelayout-wrapper {
@@ -373,6 +375,15 @@ div.v-app-loading {
.v-label-undef-w {
white-space: nowrap;
}
+/* Revert line-height for heading elements inside labels */
+.v-label h1,
+.v-label h2,
+.v-label h3,
+.v-label h4,
+.v-label h5,
+.v-label h6 {
+ line-height: normal;
+}
/* Loading indicator states
* Note: client side expects that loading indicator has a height. It depends on
* this css property to ensure browsers have applied all required styles.