Skip to content

Commit

Permalink
feat(grid): add styles for row spanned cells
Browse files Browse the repository at this point in the history
  • Loading branch information
@inikolova
inikolova committed Feb 10, 2025
1 parent 4d86733 commit 5493839
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 4 deletions.
7 changes: 6 additions & 1 deletion packages/bootstrap/scss/grid/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,10 @@ $kendo-grid-row-resizer-active-bg: $kendo-color-primary !default;
/// @group grid
$kendo-grid-row-resizer-height: k-spacing(0.5) !default;

/// The box shadow of the row spanned cells.
/// @group grid
$kendo-grid-cell-row-span: inset 0 0 0 1px $kendo-table-border !default;


@forward "@progress/kendo-theme-core/scss/components/grid/_variables.scss" with (
$kendo-grid-border-width: $kendo-grid-border-width,
Expand Down Expand Up @@ -472,5 +476,6 @@ $kendo-grid-row-resizer-height: k-spacing(0.5) !default;
$kendo-grid-group-footer-second-cell-border: $kendo-grid-group-footer-second-cell-border,
$kendo-grid-row-resizer-hover-bg: $kendo-grid-row-resizer-hover-bg,
$kendo-grid-row-resizer-active-bg: $kendo-grid-row-resizer-active-bg,
$kendo-grid-row-resizer-height: $kendo-grid-row-resizer-height
$kendo-grid-row-resizer-height: $kendo-grid-row-resizer-height,
$kendo-grid-cell-row-span: $kendo-grid-cell-row-span
);
7 changes: 6 additions & 1 deletion packages/classic/scss/grid/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,10 @@ $kendo-grid-row-resizer-active-bg: $kendo-color-primary !default;
/// @group grid
$kendo-grid-row-resizer-height: k-spacing(0.5) !default;

/// The box shadow of the row spanned cells.
/// @group grid
$kendo-grid-cell-row-span: inset 0 0 0 1px $kendo-table-border !default;


@forward "@progress/kendo-theme-core/scss/components/grid/_variables.scss" with (
$kendo-grid-border-width: $kendo-grid-border-width,
Expand Down Expand Up @@ -471,5 +475,6 @@ $kendo-grid-row-resizer-height: k-spacing(0.5) !default;
$kendo-grid-group-footer-second-cell-border: $kendo-grid-group-footer-second-cell-border,
$kendo-grid-row-resizer-hover-bg: $kendo-grid-row-resizer-hover-bg,
$kendo-grid-row-resizer-active-bg: $kendo-grid-row-resizer-active-bg,
$kendo-grid-row-resizer-height: $kendo-grid-row-resizer-height
$kendo-grid-row-resizer-height: $kendo-grid-row-resizer-height,
$kendo-grid-cell-row-span: $kendo-grid-cell-row-span
);
5 changes: 5 additions & 0 deletions packages/core/scss/components/grid/_theme.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
@use "../button/_variables.scss" as *;
@use "../list/_variables.scss" as *;
@use "../popup/_variables.scss" as *;
@use "../table/_variables.scss" as *;

@mixin kendo-grid--theme-base() {

Expand Down Expand Up @@ -91,6 +92,10 @@
background-color: $kendo-grid-hover-bg;
}

.k-table-td-row-span {
box-shadow: $kendo-grid-cell-row-span;
}

// Selected state
td.k-selected,
.k-table-row.k-selected > td,
Expand Down
2 changes: 2 additions & 0 deletions packages/core/scss/components/grid/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,3 +197,5 @@ $kendo-grid-group-footer-second-cell-border: null !default;
$kendo-grid-row-resizer-hover-bg: null !default;
$kendo-grid-row-resizer-active-bg: null !default;
$kendo-grid-row-resizer-height: null !default;

$kendo-grid-cell-row-span: null !default;
7 changes: 6 additions & 1 deletion packages/default/scss/grid/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,10 @@ $kendo-grid-row-resizer-active-bg: $kendo-color-primary !default;
/// @group grid
$kendo-grid-row-resizer-height: k-spacing(0.5) !default;

/// The box shadow of the row spanned cells.
/// @group grid
$kendo-grid-cell-row-span: inset 0 0 0 1px $kendo-table-border !default;

@forward "@progress/kendo-theme-core/scss/components/grid/_variables.scss" with (
$kendo-grid-border-width: $kendo-grid-border-width,
$kendo-grid-font-family: $kendo-grid-font-family,
Expand Down Expand Up @@ -470,5 +474,6 @@ $kendo-grid-row-resizer-height: k-spacing(0.5) !default;
$kendo-grid-group-footer-second-cell-border: $kendo-grid-group-footer-second-cell-border,
$kendo-grid-row-resizer-hover-bg: $kendo-grid-row-resizer-hover-bg,
$kendo-grid-row-resizer-active-bg: $kendo-grid-row-resizer-active-bg,
$kendo-grid-row-resizer-height: $kendo-grid-row-resizer-height
$kendo-grid-row-resizer-height: $kendo-grid-row-resizer-height,
$kendo-grid-cell-row-span: $kendo-grid-cell-row-span
);
5 changes: 5 additions & 0 deletions packages/fluent/scss/grid/_theme.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@
);
}

.k-table-td-row-span {
box-shadow: $kendo-grid-cell-row-span;
box-shadow: var( --kendo-grid-cell-row-span, #{$kendo-grid-cell-row-span} )
}

// Selected state
td.k-selected,
.k-table-row.k-selected > td,
Expand Down
4 changes: 4 additions & 0 deletions packages/fluent/scss/grid/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -581,3 +581,7 @@ $kendo-grid-row-resizer-active-bg: if($kendo-enable-color-system, k-color( prima
/// The height of the Grid row resize indicator.
/// @group grid
$kendo-grid-row-resizer-height: k-spacing(0.5) !default;

/// The box shadow of the row spanned cells.
/// @group grid
$kendo-grid-cell-row-span: inset 0 0 0 1px $kendo-table-border !default;
7 changes: 6 additions & 1 deletion packages/material/scss/grid/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,10 @@ $kendo-grid-row-resizer-active-bg: $kendo-color-primary !default;
/// @group grid
$kendo-grid-row-resizer-height: k-spacing(0.5) !default;

/// The box shadow of the row spanned cells.
/// @group grid
$kendo-grid-cell-row-span: inset 0 0 0 1px $kendo-table-border !default;

@forward "@progress/kendo-theme-core/scss/components/grid/_variables.scss" with (
$kendo-grid-border-width: $kendo-grid-border-width,
$kendo-grid-font-family: $kendo-grid-font-family,
Expand Down Expand Up @@ -471,5 +475,6 @@ $kendo-grid-row-resizer-height: k-spacing(0.5) !default;
$kendo-grid-group-footer-second-cell-border: $kendo-grid-group-footer-second-cell-border,
$kendo-grid-row-resizer-hover-bg: $kendo-grid-row-resizer-hover-bg,
$kendo-grid-row-resizer-active-bg: $kendo-grid-row-resizer-active-bg,
$kendo-grid-row-resizer-height: $kendo-grid-row-resizer-height
$kendo-grid-row-resizer-height: $kendo-grid-row-resizer-height,
$kendo-grid-cell-row-span: $kendo-grid-cell-row-span
);

0 comments on commit 5493839

Please sign in to comment.