diff options
author | Tatu Lund <tatu@vaadin.com> | 2021-03-25 11:07:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-25 11:07:37 +0200 |
commit | 9c6d8454800034d4eaed81c855b667567cf496d9 (patch) | |
tree | 401a63ee37507ba8e1826f0a2ca638d8757ea644 | |
parent | 61df35a913a11e5122526e7442e78c5e9606c251 (diff) | |
download | vaadin-framework-9c6d8454800034d4eaed81c855b667567cf496d9.tar.gz vaadin-framework-9c6d8454800034d4eaed81c855b667567cf496d9.zip |
fix: Do not allow border to grow row height (#12254)7.7.25
* fix: Do not allow border to grow row height
If css grows row height the VSrollTable rowHeight logic does not work allways
Fixes: https://github.com/vaadin/framework/issues/12251
* Compensate change in default row height
* Merge branch '7.7' into fix12251
* Replace calc with round
* Make fix more pin-point
* The first row does not have border thus regular height
* Fix drag-drop styles
* Further fix in drag-and-drop style
* Update TableDropIndicatorValoTest-indicator_ANY_Chrome__indicator.png
-rw-r--r-- | themes/src/main/themes/VAADIN/themes/valo/components/_table.scss | 15 | ||||
-rwxr-xr-x | uitest/reference-screenshots/TableDropIndicatorValoTest-indicator_ANY_Chrome__indicator.png | bin | 17564 -> 17817 bytes |
2 files changed, 9 insertions, 6 deletions
diff --git a/themes/src/main/themes/VAADIN/themes/valo/components/_table.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_table.scss index 82435a4d41..d202aabe38 100644 --- a/themes/src/main/themes/VAADIN/themes/valo/components/_table.scss +++ b/themes/src/main/themes/VAADIN/themes/valo/components/_table.scss @@ -2,13 +2,14 @@ * * @group table */ -$v-table-row-height: $v-unit-size !default; +$v-table-border-width: first-number($v-border) !default; /** * * @group table */ -$v-table-border-width: first-number($v-border) !default; +$v-table-row-height: $v-unit-size !default; +$v-table-body-row-height: round($v-table-row-height + $v-table-border-width) !default; /** * @@ -240,7 +241,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; + height: $v-table-body-row-height; vertical-align: middle; &:first-child { @@ -290,9 +291,11 @@ $v-table-background-color: null !default; .#{$primary-stylename}-table td { border-top: $v-table-border-width solid $border-color; + box-sizing: border-box; } .#{$primary-stylename}-table tr:first-child > td { + height: $v-table-row-height; border-top: none; } @@ -537,7 +540,7 @@ $v-table-background-color: null !default; .#{$primary-stylename}-row-drag-bottom td.#{$primary-stylename}-cell-content { border-bottom: 2px solid $v-focus-color; - height: $v-table-row-height - 2px; + height: $v-table-body-row-height - 2px; } .#{$primary-stylename}-row-drag-bottom .#{$primary-stylename}-cell-wrapper { @@ -546,7 +549,7 @@ $v-table-background-color: null !default; .#{$primary-stylename}-row-drag-top td.#{$primary-stylename}-cell-content { border-top: 2px solid $v-focus-color; - height: $v-table-row-height - 2px + $v-table-border-width; + height: $v-table-body-row-height - 2px + $v-table-border-width; } .#{$primary-stylename}-row-drag-top .#{$primary-stylename}-cell-wrapper { @@ -694,7 +697,7 @@ $v-table-background-color: null !default; .#{$primary-stylename}-row-drag-top .#{$primary-stylename}-cell-content, .#{$primary-stylename}-row-drag-bottom .#{$primary-stylename}-cell-content { - height: $v-table-row-height - 1px; + height: $v-table-body-row-height - 1px; } } diff --git a/uitest/reference-screenshots/TableDropIndicatorValoTest-indicator_ANY_Chrome__indicator.png b/uitest/reference-screenshots/TableDropIndicatorValoTest-indicator_ANY_Chrome__indicator.png Binary files differindex c2486c58c2..fe10c93be2 100755 --- a/uitest/reference-screenshots/TableDropIndicatorValoTest-indicator_ANY_Chrome__indicator.png +++ b/uitest/reference-screenshots/TableDropIndicatorValoTest-indicator_ANY_Chrome__indicator.png |