diff options
| author | Jouni Koivuviita <jouni@vaadin.com> | 2014-10-21 14:13:15 +0300 |
|---|---|---|
| committer | Sauli Tähkäpää <sauli@vaadin.com> | 2014-10-29 10:44:50 +0200 |
| commit | 6a7afc477caec242cbe67a7cb5d36b0a2c59cd97 (patch) | |
| tree | 73d38f5a520d7ab54d03d45346d2b04d902a5988 | |
| parent | e175a3dd2c3c9f7cdc5a113721489bb8a1174919 (diff) | |
| download | vaadin-framework-6a7afc477caec242cbe67a7cb5d36b0a2c59cd97.tar.gz vaadin-framework-6a7afc477caec242cbe67a7cb5d36b0a2c59cd97.zip | |
FormLayout margins do not work (#14610)
Change-Id: Ibad03664be53489121914a2dd7bb051cc6e5350c
| -rw-r--r-- | WebContent/VAADIN/themes/valo/components/_formlayout.scss | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/WebContent/VAADIN/themes/valo/components/_formlayout.scss b/WebContent/VAADIN/themes/valo/components/_formlayout.scss index f0001ffe94..35627ebd79 100644 --- a/WebContent/VAADIN/themes/valo/components/_formlayout.scss +++ b/WebContent/VAADIN/themes/valo/components/_formlayout.scss @@ -51,6 +51,8 @@ > .v-label-h4 { position: absolute; left: 0; + right: 0; + width: auto !important; margin-top: -0.5em; padding-bottom: 0.5em; border-bottom: valo-border($color: $v-app-background-color, $strength: 0.5); @@ -114,8 +116,22 @@ padding-left: $left; } + [class*="margin-left"] > tbody > [class*="row"] > [class*="contentcell"] { + > .v-label-h2, + > .v-label-h3, + > .v-label-h4 { + left: $left; + } + } + [class*="margin-right"] > tbody > [class*="row"] > [class*="contentcell"] { padding-right: $right; + + > .v-label-h2, + > .v-label-h3, + > .v-label-h4 { + right: $right; + } } } @@ -150,7 +166,7 @@ padding: 0; } - > table > tbody > [class*="row"] > td { + > table > tbody > tr > td { padding-top: 0; height: $row-height; // Effectively min-height border-bottom: valo-border($color: $v-app-background-color, $strength: 0.3); @@ -160,7 +176,7 @@ border-bottom: none; } - > table > tbody > [class*="row"] > [class*="captioncell"] { + > table > tbody > tr > [class*="captioncell"] { color: valo-font-color($v-background-color, .5); text-align: right; padding-left: ceil($v-unit-size/3); @@ -168,6 +184,8 @@ } > table > tbody > [class*="row"] > [class*="contentcell"] { + padding-right: 0; + > .v-textfield, > .v-textarea, > .v-filterselect, @@ -208,6 +226,8 @@ > .v-label-h3, > .v-label-h4 { border-bottom: none; + left: 0; + right: 0; } > .v-label-h3, |