Skip to content

Commit 3fd2a35

Browse files
Merge pull request #15874 from Snuffleupagus/progressBar-decouple-colors
Decouple the loadingBar `background-color` from the rest of the viewer
2 parents c791e01 + c2d17ca commit 3fd2a35

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

web/viewer-geckoview.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,8 @@
3939
:root {
4040
--main-color: rgba(249, 249, 250, 1);
4141
--body-bg-color: rgba(42, 42, 46, 1);
42-
--progressBar-color: rgba(0, 96, 223, 1);
43-
--progressBar-indeterminate-bg-color: rgba(40, 40, 43, 1);
44-
--progressBar-indeterminate-blend-color: rgba(20, 68, 133, 1);
4542
--scrollbar-color: rgba(121, 121, 123, 1);
4643
--scrollbar-bg-color: rgba(35, 35, 39, 1);
47-
4844
--dialog-button-bg-color: rgba(92, 92, 97, 1);
4945
--dialog-button-hover-bg-color: rgba(115, 115, 115, 1);
5046
}

web/viewer.css

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
--progressBar-percent: 0%;
3131
--progressBar-end-offset: 0;
3232
--progressBar-color: rgba(10, 132, 255, 1);
33-
--progressBar-indeterminate-bg-color: rgba(221, 221, 222, 1);
34-
--progressBar-indeterminate-blend-color: rgba(116, 177, 239, 1);
33+
--progressBar-bg-color: rgba(221, 221, 222, 1);
34+
--progressBar-blend-color: rgba(116, 177, 239, 1);
3535
--scrollbar-color: auto;
3636
--scrollbar-bg-color: auto;
3737
--toolbar-icon-bg-color: rgba(0, 0, 0, 1);
@@ -123,8 +123,8 @@
123123
--main-color: rgba(249, 249, 250, 1);
124124
--body-bg-color: rgba(42, 42, 46, 1);
125125
--progressBar-color: rgba(0, 96, 223, 1);
126-
--progressBar-indeterminate-bg-color: rgba(40, 40, 43, 1);
127-
--progressBar-indeterminate-blend-color: rgba(20, 68, 133, 1);
126+
--progressBar-bg-color: rgba(40, 40, 43, 1);
127+
--progressBar-blend-color: rgba(20, 68, 133, 1);
128128
--scrollbar-color: rgba(121, 121, 123, 1);
129129
--scrollbar-bg-color: rgba(35, 35, 39, 1);
130130
--toolbar-icon-bg-color: rgba(255, 255, 255, 1);
@@ -374,7 +374,7 @@ body {
374374
position: absolute;
375375
inset-inline: 0 var(--progressBar-end-offset);
376376
height: 4px;
377-
background-color: var(--body-bg-color);
377+
background-color: var(--progressBar-bg-color);
378378
border-bottom: 1px solid var(--toolbar-border-color);
379379
transition-property: inset-inline-start;
380380
transition-duration: var(--sidebar-transition-duration);
@@ -409,7 +409,7 @@ body {
409409

410410
#loadingBar.indeterminate .progress {
411411
transform: none;
412-
background-color: var(--progressBar-indeterminate-bg-color);
412+
background-color: var(--progressBar-bg-color);
413413
transition: none;
414414
}
415415

@@ -421,12 +421,12 @@ body {
421421
width: calc(100% + 150px);
422422
background: repeating-linear-gradient(
423423
135deg,
424-
var(--progressBar-indeterminate-blend-color) 0,
425-
var(--progressBar-indeterminate-bg-color) 5px,
426-
var(--progressBar-indeterminate-bg-color) 45px,
424+
var(--progressBar-blend-color) 0,
425+
var(--progressBar-bg-color) 5px,
426+
var(--progressBar-bg-color) 45px,
427427
var(--progressBar-color) 55px,
428428
var(--progressBar-color) 95px,
429-
var(--progressBar-indeterminate-blend-color) 100px
429+
var(--progressBar-blend-color) 100px
430430
);
431431
animation: progressIndeterminate 1s linear infinite;
432432
}

0 commit comments

Comments
 (0)