Skip to content

Commit 1b1023e

Browse files
fix(grid): modify hover color
1 parent 68cea3d commit 1b1023e

File tree

3 files changed

+6
-28
lines changed

3 files changed

+6
-28
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
$ui-grid-cell-background-color: var(--color-background, #ffffff);
22
$ui-grid-border-color: var(--color-border-de-emp, #cfd8dd);
33
$ui-grid-cell-bottom-border: 1px solid $ui-grid-border-color;
4-
$ui-grid-row-hover-color: var(--color-hover, #e9f1fa);
4+
$ui-grid-row-hover-color: var(--color-data-grid-hover, #F1F2F3);
5+
$ui-grid-header-pressed-color: var(--color-data-grid-pressed, #EAECED);
56
$header-background-color: var(--color-background-secondary, #f4f5f7);
67
$grid-actions-box-shadow: var(--color-background, #ffffff);
78
$highlighted-entity-color: var(--color-primary, #0067df);

projects/angular/components/ui-grid/src/_ui-grid.theme.scss

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -204,33 +204,14 @@ $ui-grid-opacity-transition: opacity $ui-grid-default-transition;
204204

205205
.ui-grid-row {
206206
&:focus,
207+
&:hover,
207208
&.cdk-focused {
208209
background-color: $ui-grid-row-hover-color;
209210

210-
&:not(.ui-grid-row-state-expanded) {
211-
.ui-grid-header-cell,
212-
.ui-grid-cell {
213-
background-color: $ui-grid-row-hover-color;
214-
}
215-
}
216-
217-
outline: none;
218-
219-
.ui-grid-action-cell-container {
220-
opacity: 1;
211+
.ui-grid-header-cell,
212+
.ui-grid-cell {
221213
background-color: $ui-grid-row-hover-color;
222214
}
223-
}
224-
225-
&:hover {
226-
background-color: $ui-grid-row-hover-color;
227-
228-
&:not(.ui-grid-row-state-expanded) {
229-
.ui-grid-header-cell,
230-
.ui-grid-cell {
231-
background-color: $ui-grid-row-hover-color;
232-
}
233-
}
234215

235216
outline: none;
236217

projects/angular/components/ui-grid/src/ui-grid.component.scss

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ ui-grid {
461461
&.ui-grid-state-resizing,
462462
&:focus,
463463
&.cdk-focused {
464-
background-color: $ui-grid-row-hover-color;
464+
background-color: $ui-grid-header-pressed-color;
465465
}
466466
}
467467
}
@@ -734,10 +734,6 @@ ui-grid {
734734
.ui-grid-cell {
735735
height: $ui-grid-row-height - $ui-row-border-width;
736736
background: $ui-grid-cell-background-color;
737-
738-
&.ui-grid-state-resizing {
739-
background: $ui-grid-row-hover-color;
740-
}
741737
}
742738

743739
.sticky-columns-cell-container.ui-grid-cell {

0 commit comments

Comments
 (0)