diff options
| author | Pekka Hyvönen <pekka@vaadin.com> | 2015-05-08 10:43:37 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-05-12 13:11:44 +0000 |
| commit | 26087a85313cdf0be8cb7ee4dea5cf90e4e130ec (patch) | |
| tree | 67600f8d706257e0be019d6be461520ff13193cc /WebContent/VAADIN | |
| parent | 46d0e0c60077665f3cf1f80503bd30313d7fa61e (diff) | |
| download | vaadin-framework-26087a85313cdf0be8cb7ee4dea5cf90e4e130ec.tar.gz vaadin-framework-26087a85313cdf0be8cb7ee4dea5cf90e4e130ec.zip | |
Fixed regression in details row for IE8&9 and another small bug (#17423)
Regression caused by the previous patch for the ticket. Details row inherited extra margin-top from parent.
Because some position functions in escalator use left for transforming the rows, the offset caused
by the spacer deco was switched to padding-left from left, so it won't get overridden by the position
funcion.
Change-Id: I774ab9573c95f971a0e625dc8d79370f3d86daec
Diffstat (limited to 'WebContent/VAADIN')
| -rw-r--r-- | WebContent/VAADIN/themes/base/escalator/escalator.scss | 7 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/grid/grid.scss | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/WebContent/VAADIN/themes/base/escalator/escalator.scss b/WebContent/VAADIN/themes/base/escalator/escalator.scss index 73d45854b9..2d5ad729fc 100644 --- a/WebContent/VAADIN/themes/base/escalator/escalator.scss +++ b/WebContent/VAADIN/themes/base/escalator/escalator.scss @@ -145,5 +145,12 @@ @include box-sizing(border-box); } + .v-ie8 &, .v-ie9 & { + // The inline style of margin-top from the <tbody> to offset the + // header's dimension is, for some strange reason, inherited into each + // contained <tr>. We need to cancel it: + + margin-top: 0; + } } } diff --git a/WebContent/VAADIN/themes/base/grid/grid.scss b/WebContent/VAADIN/themes/base/grid/grid.scss index 531abb1ff1..ede4ccca0d 100644 --- a/WebContent/VAADIN/themes/base/grid/grid.scss +++ b/WebContent/VAADIN/themes/base/grid/grid.scss @@ -437,9 +437,10 @@ $v-grid-details-border-bottom-stripe: 1px solid darken($v-grid-row-background-co } .#{$primaryStyleName}-spacer { - left: $v-grid-details-marker-width - $v-grid-border-size; + // using padding since left is used with some position functions in escalator + padding-left: $v-grid-details-marker-width - $v-grid-border-size; } - + .#{$primaryStyleName}-spacer > td { display: block; padding: 0; |