Skip to content

Commit 6c32367

Browse files
Use CSS Vars for primary color (#13361)
* Use CSS Vars for primary color - Create 15 color shades derived from primary color - Change blue-ish colors to use that primary color - Move styles for scrollbars, selection from arc-green to base - Remove obsolete arc-green styles that now use those variables * simplify webkit scrollbar style Co-authored-by: techknowlogick <[email protected]>
1 parent b5e974c commit 6c32367

File tree

4 files changed

+125
-121
lines changed

4 files changed

+125
-121
lines changed

web_src/less/_base.less

Lines changed: 95 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@
66
/* other variables */
77
--fonts-regular: var(--fonts-proportional), var(--fonts-emoji), sans-serif;
88
--border-radius: .28571429rem;
9+
--color-primary: #4183c4;
10+
--color-primary-dark-1: #3876b3;
11+
--color-primary-dark-2: #31699f;
12+
--color-primary-dark-3: #2b5c8b;
13+
--color-primary-dark-4: #254f77;
14+
--color-primary-dark-5: #193450;
15+
--color-primary-dark-6: #0c1a28;
16+
--color-primary-dark-7: #04080c;
17+
--color-primary-light-1: #548fca;
18+
--color-primary-light-2: #679cd0;
19+
--color-primary-light-3: #7aa8d6;
20+
--color-primary-light-4: #8db5dc;
21+
--color-primary-light-5: #b3cde7;
22+
--color-primary-light-6: #d9e6f3;
23+
--color-primary-light-7: #f4f8fb;
24+
--color-body: #fff;
925
}
1026

1127
:root:lang(ja) {
@@ -96,7 +112,7 @@ h5,
96112
}
97113

98114
body {
99-
background-color: #ffffff;
115+
background-color: var(--color-body);
100116
overflow-y: auto;
101117
display: flex;
102118
flex-direction: column;
@@ -110,10 +126,47 @@ table {
110126
border-collapse: collapse;
111127
}
112128

113-
a {
129+
/* firefox scroll bars */
130+
131+
* {
132+
scrollbar-width: thin;
133+
scrollbar-color: var(--color-primary) transparent;
134+
}
135+
136+
/* webkit scrollbars */
137+
138+
::-webkit-scrollbar {
139+
width: 10px;
140+
}
141+
::-webkit-scrollbar-thumb {
142+
box-shadow: inset 0 0 0 6px var(--color-primary);
143+
border: 2px solid transparent;
144+
border-radius: 5px !important;
145+
}
146+
::-webkit-scrollbar-thumb:window-inactive {
147+
box-shadow: inset 0 0 0 6px var(--color-primary);
148+
}
149+
::-webkit-scrollbar-thumb:hover {
150+
box-shadow: inset 0 0 0 6px var(--color-primary-dark-2);
151+
}
152+
153+
::selection,
154+
.CodeMirror-selected {
155+
background: var(--color-primary-light-1) !important;
156+
color: #fff !important;
157+
}
158+
159+
a,
160+
.ui.breadcrumb a {
161+
color: var(--color-primary);
114162
cursor: pointer;
115163
}
116164

165+
a:hover,
166+
.ui.breadcrumb a:hover {
167+
color: var(--color-primary-dark-2);
168+
}
169+
117170
.rounded {
118171
border-radius: var(--border-radius) !important;
119172
}
@@ -331,13 +384,13 @@ code,
331384
}
332385

333386
&.blue {
334-
color: #428bca !important;
387+
color: var(--color-primary-dark-1) !important;
335388

336389
a {
337-
color: #1155cc !important;
390+
color: var(--color-primary) !important;
338391

339392
&:hover {
340-
color: #428bca !important;
393+
color: var(--color-primary-dark-2) !important;
341394
}
342395
}
343396
}
@@ -568,7 +621,7 @@ code,
568621
}
569622

570623
&.blue {
571-
background-color: #428bca !important;
624+
background-color: var(--color-primary) !important;
572625
}
573626

574627
&.black {
@@ -623,7 +676,7 @@ code,
623676
}
624677

625678
&.blue {
626-
border-color: #428bca !important;
679+
border-color: var(--color-primary) !important;
627680
}
628681

629682
&.black {
@@ -740,7 +793,7 @@ footer {
740793
.fa {
741794
width: 16px;
742795
text-align: center;
743-
color: #428bca;
796+
color: var(--color-primary);
744797
}
745798

746799
.links > * {
@@ -1150,10 +1203,42 @@ i.icon.centerlock {
11501203
font-size: .85714286rem;
11511204
}
11521205

1206+
.ui.blue.button,
1207+
.ui.blue.buttons .button {
1208+
background-color: var(--color-primary) !important;
1209+
}
1210+
1211+
.ui.blue.button:hover,
1212+
.ui.blue.buttons .button:hover {
1213+
background-color: var(--color-primary-dark-2) !important;
1214+
}
1215+
1216+
.ui.blue.button:focus,
1217+
.ui.blue.buttons .button:focus {
1218+
background-color: var(--color-primary-dark-3) !important;
1219+
}
1220+
11531221
.ui.basic.blue.button,
11541222
.ui.basic.blue.buttons .button {
1155-
box-shadow: inset 0 0 0 1px #1678c2 !important;
1156-
color: #1678c2 !important;
1223+
box-shadow: inset 0 0 0 1px var(--color-primary) !important;
1224+
color: #fff !important;
1225+
}
1226+
1227+
.ui.basic.blue.button:hover,
1228+
.ui.basic.blue.buttons .button:hover {
1229+
box-shadow: inset 0 0 0 1px var(--color-primary-dark-2) !important;
1230+
}
1231+
1232+
.ui.basic.blue.button:focus,
1233+
.ui.basic.blue.buttons .button:focus {
1234+
box-shadow: inset 0 0 0 1px var(--color-primary-dark-3) !important;
1235+
}
1236+
1237+
.ui.blue.label,
1238+
.ui.blue.labels .label,
1239+
.repository .segment.reactions .ui.label.basic.blue {
1240+
background-color: var(--color-primary) !important;
1241+
border-color: var(--color-primary-dark-2) !important;
11571242
}
11581243

11591244
.ui.label > img {

web_src/less/_repository.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@
345345

346346
&.octicon-file-directory,
347347
&.octicon-file-submodule {
348-
color: #1e70bf;
348+
color: var(--color-primary);
349349
}
350350
}
351351
}
@@ -717,7 +717,7 @@
717717

718718
.pull-desc {
719719
code {
720-
color: #0166e6;
720+
color: var(--color-primary);
721721
}
722722
}
723723

web_src/less/_review.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ a.blob-excerpt {
145145
justify-content: center;
146146
align-items: center;
147147
width: 100%;
148-
background: #daecfe;
148+
background: var(--color-primary-light-5);
149149
}
150150

151151
a.blob-excerpt:hover {
152-
background: #428bca;
152+
background: var(--color-primary);
153153
color: #fff;
154154
}
155155

0 commit comments

Comments
 (0)