summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/reindeer
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2012-10-01 14:06:43 +0300
committerHenri Sara <hesara@vaadin.com>2012-10-01 14:06:43 +0300
commit110105726fc186dfec121f0a5b184d3523431d0b (patch)
tree8cba6607224de1d94573ebafb2f229cab3a25e19 /WebContent/VAADIN/themes/reindeer
parent4a9daa9edda206840aef12732606608587ce05ac (diff)
downloadvaadin-framework-110105726fc186dfec121f0a5b184d3523431d0b.tar.gz
vaadin-framework-110105726fc186dfec121f0a5b184d3523431d0b.zip
Merge from 6.8: Limit propagation of vertical spacing and margins in
nested FormLayouts, related test (#9427) svn changeset:24503/svn branch:6.8 svn changeset:24504/svn branch:6.8 svn changeset:24506/svn branch:6.8 Change-Id: I7eca0fccdd9fc9258514c68025bd9e99dcc0b89d
Diffstat (limited to 'WebContent/VAADIN/themes/reindeer')
-rw-r--r--WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss22
1 files changed, 11 insertions, 11 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss b/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss
index ab47767dcf..e73340fd3b 100644
--- a/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss
+++ b/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss
@@ -12,25 +12,25 @@
text-align: right;
white-space: nowrap;
}
-.v-formlayout-spacing .v-formlayout-row .v-formlayout-captioncell,
-.v-formlayout-spacing .v-formlayout-row .v-formlayout-contentcell,
-.v-formlayout-spacing .v-formlayout-row .v-formlayout-errorcell {
+.v-formlayout-spacing > tbody > .v-formlayout-row > .v-formlayout-captioncell,
+.v-formlayout-spacing > tbody > .v-formlayout-row > .v-formlayout-contentcell,
+.v-formlayout-spacing > tbody > .v-formlayout-row > .v-formlayout-errorcell {
padding-top: 8px;
}
-.v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-captioncell,
-.v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-contentcell,
-.v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-errorcell {
+.v-formlayout-margin-top > tbody > .v-formlayout-firstrow > .v-formlayout-captioncell,
+.v-formlayout-margin-top > tbody > .v-formlayout-firstrow > .v-formlayout-contentcell,
+.v-formlayout-margin-top > tbody > .v-formlayout-firstrow > .v-formlayout-errorcell {
padding-top: 15px;
}
-.v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-captioncell,
-.v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-contentcell,
-.v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-errorcell {
+.v-formlayout-margin-bottom > tbody > .v-formlayout-lastrow > .v-formlayout-captioncell,
+.v-formlayout-margin-bottom > tbody > .v-formlayout-lastrow > .v-formlayout-contentcell,
+.v-formlayout-margin-bottom > tbody > .v-formlayout-lastrow > .v-formlayout-errorcell {
padding-bottom: 15px;
}
-.v-formlayout-margin-left .v-formlayout-captioncell {
+.v-formlayout-margin-left > tbody > .v-formlayout-row > .v-formlayout-captioncell {
padding-left: 18px;
}
-.v-formlayout-margin-right .v-formlayout-contentcell {
+.v-formlayout-margin-right > tbody > .v-formlayout-row > .v-formlayout-contentcell {
padding-right: 18px;
}
/* form */