summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes
diff options
context:
space:
mode:
authorJouni Koivuviita <jouni.koivuviita@itmill.com>2010-02-22 08:49:50 +0000
committerJouni Koivuviita <jouni.koivuviita@itmill.com>2010-02-22 08:49:50 +0000
commit0f5f684b0656878c5bb5118035877d83f623f0ff (patch)
treed951f9f98faa4c499f357cf10db261a3aca876ef /WebContent/VAADIN/themes
parent0912071d8c6a65be05f1fe81bb3b998fb56ce63e (diff)
downloadvaadin-framework-0f5f684b0656878c5bb5118035877d83f623f0ff.tar.gz
vaadin-framework-0f5f684b0656878c5bb5118035877d83f623f0ff.zip
Reverted gridlayout margins and spacings back to original after [11248].
svn changeset:11447/svn branch:6.3
Diffstat (limited to 'WebContent/VAADIN/themes')
-rw-r--r--WebContent/VAADIN/themes/reindeer/layouts/layouts.css18
-rw-r--r--WebContent/VAADIN/themes/reindeer/styles.css18
2 files changed, 36 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/layouts/layouts.css b/WebContent/VAADIN/themes/reindeer/layouts/layouts.css
index 1699baddf7..5920830086 100644
--- a/WebContent/VAADIN/themes/reindeer/layouts/layouts.css
+++ b/WebContent/VAADIN/themes/reindeer/layouts/layouts.css
@@ -24,6 +24,24 @@
padding-top: 7px;
padding-left: 6px;
}
+/* Different for historical reasons: previously was inherited directly from Base theme */
+/* TODO unify these values in version 7 */
+.v-gridlayout-margin-top {
+ padding-top: 24px;
+}
+.v-gridlayout-margin-bottom {
+ padding-bottom: 24px;
+}
+.v-gridlayout-margin-left {
+ padding-left: 24px;
+}
+.v-gridlayout-margin-right {
+ padding-right: 24px;
+}
+.v-gridlayout-spacing-on {
+ padding-left: 12px;
+ padding-top: 12px;
+}
/* Blue background */
.v-verticallayout-blue,
.v-horizontallayout-blue,
diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index 7de56769d2..f005ef3a1e 100644
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -3078,6 +3078,24 @@ td.v-datefield-calendarpanel-nextyear {
padding-top: 7px;
padding-left: 6px;
}
+/* Different for historical reasons: previously was inherited directly from Base theme */
+/* TODO unify these values in version 7 */
+.v-gridlayout-margin-top {
+ padding-top: 24px;
+}
+.v-gridlayout-margin-bottom {
+ padding-bottom: 24px;
+}
+.v-gridlayout-margin-left {
+ padding-left: 24px;
+}
+.v-gridlayout-margin-right {
+ padding-right: 24px;
+}
+.v-gridlayout-spacing-on {
+ padding-left: 12px;
+ padding-top: 12px;
+}
/* Blue background */
.v-verticallayout-blue,
.v-horizontallayout-blue,