Skip to content

Commit

Permalink
fix: Do not allow border to grow row height (#12254)
Browse files Browse the repository at this point in the history
* fix: Do not allow border to grow row height

If css grows row height the VSrollTable rowHeight logic does not work allways

Fixes: #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
  • Loading branch information
TatuLund committed Mar 25, 2021
1 parent 61df35a commit 9c6d845
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions themes/src/main/themes/VAADIN/themes/valo/components/_table.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
*
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down Expand Up @@ -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;
}
}

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9c6d845

Please sign in to comment.