diff options
| -rw-r--r-- | WebContent/VAADIN/themes/valo/components/_table.scss | 14 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/themes/valo/Tables.java | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/valo/components/_table.scss b/WebContent/VAADIN/themes/valo/components/_table.scss index deef084561..2335c59873 100644 --- a/WebContent/VAADIN/themes/valo/components/_table.scss +++ b/WebContent/VAADIN/themes/valo/components/_table.scss @@ -162,6 +162,7 @@ $v-table-background-color: null !default; .#{$primary-stylename}-cell-content { border-left: $v-table-border-width solid $border-color; overflow: hidden; + height: $v-table-row-height; &:first-child { border-left: none; @@ -181,6 +182,10 @@ $v-table-background-color: null !default; padding: $vertical-padding $v-table-cell-padding-horizontal; @include box-sizing(border-box); margin-right: 0 !important; + + > .v-widget { + margin: round($vertical-padding / -2) round($v-table-cell-padding-horizontal / -2); + } } .#{$primary-stylename}-body { @@ -429,6 +434,7 @@ $v-table-background-color: null !default; content: ""; display: block; position: absolute; + z-index: 1; height: $v-table-row-height + $v-table-border-width; left: 0; right: 0; @@ -588,8 +594,16 @@ $v-table-background-color: null !default; height: $row-height; } + .#{$primary-stylename}-cell-content { + height: $row-height; + } + .#{$primary-stylename}-cell-wrapper { padding: $vertical-padding $cell-padding-horizontal; + + > .v-widget { + margin: round($vertical-padding / -2) round($cell-padding-horizontal / -2); + } } .#{$primary-stylename}-header-cell-asc .#{$primary-stylename}-sort-indicator, diff --git a/uitest/src/com/vaadin/tests/themes/valo/Tables.java b/uitest/src/com/vaadin/tests/themes/valo/Tables.java index 442e3e509a..62ef67f9f3 100644 --- a/uitest/src/com/vaadin/tests/themes/valo/Tables.java +++ b/uitest/src/com/vaadin/tests/themes/valo/Tables.java @@ -48,7 +48,7 @@ public class Tables extends VerticalLayout implements View { CheckBox footer = new CheckBox("Footer", true); CheckBox sized = new CheckBox("Sized"); CheckBox expandRatios = new CheckBox("Expand ratios"); - CheckBox stripes = new CheckBox("Sripes", true); + CheckBox stripes = new CheckBox("Stripes", true); CheckBox verticalLines = new CheckBox("Vertical lines", true); CheckBox horizontalLines = new CheckBox("Horizontal lines", true); CheckBox borderless = new CheckBox("Borderless"); |