Skip to content

Commit

Permalink
FilterPanel, selected and deleted row background colors (#25916)
Browse files Browse the repository at this point in the history
  • Loading branch information
Raushen authored Oct 31, 2023
1 parent 14a41f1 commit 94b5e26
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
10 changes: 4 additions & 6 deletions packages/devextreme/scss/widgets/fluent/gridBase/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ $header-filter-color-empty: null !default;
* $name 55. Selected row background color
* $type color
*/
$datagrid-selection-bg: null !default;
$datagrid-selection-bg: $base-bg-active !default;

/**
* $name 60. Selected row border color
* $type color
*/
$datagrid-row-selected-border-color: $datagrid-border-color !default;
$datagrid-row-selected-border-color: $base-bg-active !default;

/**
* $name 50. Selected row text color
Expand Down Expand Up @@ -84,8 +84,8 @@ $datagrid-menu-icon-color: lighten($base-icon-color, 33.7%) !default;
* $type color
*/
$datagrid-cell-modified-border-color: $button-success-text-hover-bg !default;
$datagrid-cell-removed-border-color: $datagrid-border-color !default;
$datagrid-row-removed-bg: $datagrid-border-color !default;
$datagrid-cell-removed-border-color: $base-bg-active !default;
$datagrid-row-removed-bg: $base-bg-active !default;
$datagrid-cell-removed-text-color: null !default;

/**
Expand Down Expand Up @@ -181,7 +181,6 @@ $datagrid-icon-link-disabled-opacity: $button-disabled-icon-opacity;
$datagrid-drag-header-second-shadow-color: color.change($base-shadow-color, $alpha: 0.2) !default;
$header-filter-color: $datagrid-columnchooser-item-color !default;
$header-filter-color-empty: color.change($header-filter-color, $alpha: 0.72) !default;
$datagrid-selection-bg: color.change(darken($base-element-bg, 100%), $alpha: 0.08) !default;
$datagrid-row-error-color: $base-inverted-text-color !default;
$datagrid-columnchooser-item-bg: $datagrid-columnchooser-bg !default;
$datagrid-row-alternation-bg: darken($datagrid-base-background-color, 4%) !default;
Expand All @@ -198,7 +197,6 @@ $datagrid-icon-link-disabled-opacity: $button-disabled-icon-opacity;
$datagrid-drag-header-second-shadow-color: color.change($base-shadow-color, $alpha: 0.4) !default;
$header-filter-color: $datagrid-columnchooser-item-color !default;
$header-filter-color-empty: color.change($header-filter-color, $alpha: 0.38) !default;
$datagrid-selection-bg: color.change(lighten($base-element-bg, 100%), $alpha: 0.08) !default;
$datagrid-row-error-color: rgba(255, 255, 255, 1) !default;
$datagrid-columnchooser-item-bg: lighten($datagrid-columnchooser-bg, 3%) !default;
$datagrid-row-alternation-bg: lighten($datagrid-base-background-color, 4%) !default;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1225,6 +1225,7 @@ $fluent-grid-base-group-panel-message-line-height: $fluent-button-text-line-heig
}

.dx-#{$widget-name}-filter-panel {
background-color: $datagrid-base-background-color;
padding: 18px $fluent-grid-base-cell-horizontal-padding;

.dx-#{$widget-name}-filter-panel-text,
Expand Down

0 comments on commit 94b5e26

Please sign in to comment.