diff options
| author | Marc Englund <marc@vaadin.com> | 2012-10-04 09:34:37 +0300 |
|---|---|---|
| committer | Marc Englund <marc@vaadin.com> | 2012-10-04 09:34:37 +0300 |
| commit | 0f5606dace38d575efcd2e0109390b34aebb05d3 (patch) | |
| tree | 5d0a032ebecbec80a33f90971ae2d0a37ab43956 /WebContent/VAADIN/themes/base/formlayout | |
| parent | 76b0655b29ed8aa4b1287f2b68322ed1f9c58faa (diff) | |
| parent | 7fbe0ffd7c967728a1e437d0cbe03722ed9f1b6e (diff) | |
| download | vaadin-framework-0f5606dace38d575efcd2e0109390b34aebb05d3.tar.gz vaadin-framework-0f5606dace38d575efcd2e0109390b34aebb05d3.zip | |
Merge branch 'master' into sass
Conflicts:
WebContent/VAADIN/themes/base/formlayout/formlayout.scss
WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss
Change-Id: Ie895a1bbafdcf2fe79d500efb04c6eef3f5a812e
Diffstat (limited to 'WebContent/VAADIN/themes/base/formlayout')
| -rw-r--r-- | WebContent/VAADIN/themes/base/formlayout/formlayout.scss | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/WebContent/VAADIN/themes/base/formlayout/formlayout.scss b/WebContent/VAADIN/themes/base/formlayout/formlayout.scss index 48a1bf0fde..6bfe112254 100644 --- a/WebContent/VAADIN/themes/base/formlayout/formlayout.scss +++ b/WebContent/VAADIN/themes/base/formlayout/formlayout.scss @@ -23,30 +23,30 @@ .#{$name}-captioncell .v-caption { overflow: visible; } -.#{$name}-spacing .#{$name}-row .#{$name}-captioncell, -.#{$name}-spacing .#{$name}-row .#{$name}-contentcell, -.#{$name}-spacing .#{$name}-row .#{$name}-errorcell { +.#{$name}-spacing > tbody > .#{$name}-row > .#{$name}-captioncell, +.#{$name}-spacing > tbody > .#{$name}-row > .#{$name}-contentcell, +.#{$name}-spacing > tbody > .#{$name}-row > .#{$name}-errorcell { padding-top: 6px; } -.#{$name}-spacing .#{$name}-firstrow .#{$name}-captioncell, -.#{$name}-spacing .#{$name}-firstrow .#{$name}-contentcell, -.#{$name}-spacing .#{$name}-firstrow .#{$name}-errorcell { +.#{$name}-spacing > tbody > .#{$name}-firstrow > .#{$name}-captioncell, +.#{$name}-spacing > tbody > .#{$name}-firstrow > .#{$name}-contentcell, +.#{$name}-spacing > tbody > .#{$name}-firstrow > .#{$name}-errorcell { padding-top: 0; } -.#{$name}-margin-top .#{$name}-firstrow .#{$name}-captioncell, -.#{$name}-margin-top .#{$name}-firstrow .#{$name}-contentcell, -.#{$name}-margin-top .#{$name}-firstrow .#{$name}-errorcell { +.#{$name}-margin-top > tbody > .#{$name}-firstrow > .#{$name}-captioncell, +.#{$name}-margin-top > tbody > .#{$name}-firstrow > .#{$name}-contentcell, +.#{$name}-margin-top > tbody > .#{$name}-firstrow > .#{$name}-errorcell { padding-top: 12px; } -.#{$name}-margin-bottom .#{$name}-lastrow .#{$name}-captioncell, -.#{$name}-margin-bottom .#{$name}-lastrow .#{$name}-contentcell, -.#{$name}-margin-bottom .#{$name}-lastrow .#{$name}-errorcell { +.#{$name}-margin-bottom > tbody > .#{$name}-lastrow > .#{$name}-captioncell, +.#{$name}-margin-bottom > tbody > .#{$name}-lastrow > .#{$name}-contentcell, +.#{$name}-margin-bottom > tbody > .#{$name}-lastrow > .#{$name}-errorcell { padding-bottom: 12px; } -.#{$name}-margin-left .#{$name}-captioncell { +.#{$name}-margin-left > tbody > .#{$name}-row > .#{$name}-captioncell { padding-left: 12px; } -.#{$name}-margin-right .#{$name}-contentcell { +.#{$name}-margin-right > tbody > .#{$name}-row > .#{$name}-contentcell { padding-right: 12px; } .#{$name}-captioncell .v-caption .v-required-field-indicator { |