Skip to content

Commit 7568d48

Browse files
FIREFLY-1485: Homogenise different scrollbars colors
1 parent 806afd1 commit 7568d48

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

src/firefly/html/css/global.css

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -494,19 +494,25 @@ div.rootStyle img {
494494

495495
/*------------------- generic-browser scrollbars ---------------------*/
496496
/* from https://developer.chrome.com/docs/css-ui/scrollbar-styling */
497+
:root {
498+
--scrollbar-color-thumb: var(--joy-palette-neutral-softActiveBg);
499+
--scrollbar-color-track: var(--joy-palette-background-surface);
500+
--scrollbar-color-thumb-active: var(--joy-palette-neutral-softDisabledColor); /* one shade darker than softActiveBg */
501+
}
502+
497503
/* Modern browsers with `scrollbar-*` support */
498504
@supports (scrollbar-width: auto) {
499-
#app {
500-
scrollbar-color: var(--joy-palette-neutral-solidBg) var(--joy-palette-background-level1); /*thumb-color track-color*/
505+
body {
506+
scrollbar-color: var(--scrollbar-color-thumb) var(--scrollbar-color-track);
501507
}
502508
}
503509

504510
/* Legacy browsers with `::-webkit-scrollbar-*` support */
505511
@supports selector(::-webkit-scrollbar) {
506-
#app::-webkit-scrollbar-thumb {
507-
background: var(--joy-palette-neutral-solidBg);
512+
body::-webkit-scrollbar-thumb {
513+
background: var(--scrollbar-color-thumb);
508514
}
509-
#app::-webkit-scrollbar-track {
510-
background: var(--joy-palette-background-level1);
515+
body::-webkit-scrollbar-track {
516+
background: var(--scrollbar-color-track);
511517
}
512518
}

src/firefly/js/tables/ui/TablePanel.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,24 +165,24 @@ Overriding default fixed-table css
165165

166166
.public_Scrollbar_main.public_Scrollbar_mainActive,
167167
.public_Scrollbar_main {
168-
background-color: var(--joy-palette-background-surface);
168+
background-color: var(--scrollbar-color-track);
169169
border-color: var(--joy-palette-neutral-outlinedBorder);
170170
}
171171

172172
.public_Scrollbar_mainOpaque,
173173
.public_Scrollbar_mainOpaque.public_Scrollbar_mainActive,
174174
.public_Scrollbar_mainOpaque:hover {
175-
background-color: var(--joy-palette-background-surface);
175+
background-color: var(--scrollbar-color-track);
176176
}
177177

178178
.public_Scrollbar_face:after {
179-
background-color: var(--joy-palette-neutral-softActiveBg);
179+
background-color: var(--scrollbar-color-thumb);
180180
}
181181

182182
.public_Scrollbar_main:hover .public_Scrollbar_face:after,
183183
.public_Scrollbar_mainActive .public_Scrollbar_face:after,
184184
.public_Scrollbar_faceActive:after {
185-
background-color: var(--joy-palette-neutral-solidBg);
185+
background-color: var(--scrollbar-color-thumb-active);
186186
}
187187

188188
.public_fixedDataTableRow_columnsShadow {

0 commit comments

Comments
 (0)