Skip to content

Commit ecf6392

Browse files
rjzupkoiirjzupkoii
committed
academicpages#137, academicpages#851, academicpages#911, academicpages#1031 cleaning up remainder of direct references to theme colors
1 parent 0d73708 commit ecf6392

14 files changed

+39
-33
lines changed

‎_sass/_syntax.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ div.highlighter-rouge, figure.highlight {
1717
top: 0;
1818
right: 0;
1919
padding: 0.5em;
20-
background-color: $lighter-gray;
20+
background-color: mix(#fff, #7a8288, 90%);
2121
content: "\f121";
2222
font-family: "Font Awesome 6 Free" !important;
2323
font-size: $type-size-6;

‎_sass/_themes.scss

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
/* ==========================================================================
2-
COMMON COLOR CODES
2+
SHARED THEME SETTINGS
33
========================================================================== */
44

5-
/* Color codes used throughout the site */
6-
$gray : #7a8288;
7-
$dark-gray : mix(#000, $gray, 40%);
8-
$darker-gray : mix(#000, $gray, 60%);
9-
$light-gray : mix(#fff, $gray, 50%);
10-
$lighter-gray : mix(#fff, $gray, 90%);
11-
125
/* ==========================================================================
136
TYPOGRAPHY
147
========================================================================== */

‎_sass/include/_utilities.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ body:hover .visually-hidden button {
485485
}
486486

487487
a.reversefootnote {
488-
color: $gray;
488+
color: var(--global-text-color-light);
489489
text-decoration: none;
490490

491491
&:hover {

‎_sass/layout/_archive.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
margin: 1.414em 0 0;
3232
padding-bottom: 0.5em;
3333
font-size: $type-size-5;
34-
color: mix(#fff, $gray, 25%);
34+
color: var(--global-text-color-light);
3535
border-bottom: 1px solid var(--global-border-color);
3636

3737
+ .list__item .archive__item-title {

‎_sass/layout/_base.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ td > code {
145145
padding-bottom: 0.1rem;
146146
font-size: $type-size-6;
147147
background: var(--global-code-background-color);
148-
border: 1px solid $lighter-gray;
148+
border: 1px solid var(--global-thead-color);
149149
border-radius: $border-radius;
150150
box-shadow: $box-shadow;
151151
color: var(--global-code-text-color);
@@ -248,7 +248,7 @@ figcaption {
248248
a {
249249
color: inherit;
250250
text-decoration: none;
251-
border-bottom: 1px solid $light-gray;
251+
border-bottom: 1px solid var(--global-border-color );
252252
-webkit-transition: $global-transition;
253253
transition: $global-transition;
254254

‎_sass/layout/_buttons.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
/* for dark backgrounds */
4949

5050
&--inverse {
51-
color: $gray !important;
52-
border: 1px solid $light-gray !important; /* override*/
51+
color: var(--global-text-color-light) !important;
52+
border: 1px solid var(--global-border-color) !important; /* override*/
5353
background-color: #fff;
5454

5555
&:hover {
5656
color: #fff !important;
57-
border-color: $gray;
57+
border-color: var(--global-text-color-light);
5858
}
5959
}
6060

‎_sass/layout/_footer.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
animation: intro 0.3s both;
2626
-webkit-animation-delay: 0.45s;
2727
animation-delay: 0.45s;
28-
border-top: 1px solid $light-gray;
28+
border-top: 1px solid var(var(--global-border-color));
2929

3030
footer {
3131
@include clearfix;
@@ -53,7 +53,7 @@
5353
.fab,
5454
.far,
5555
.fal {
56-
color: mix(#fff, $gray, 25%);
56+
color: var(--global-text-color-light);
5757
}
5858
}
5959

‎_sass/layout/_masthead.scss

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
}
4848

4949
.masthead__menu-item {
50+
background-color: var(--global-bg-color);
5051
display: block;
5152
list-style-type: none;
5253
white-space: nowrap;

‎_sass/layout/_navigation.scss

+9-9
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@
8383
line-height: 1.5;
8484
text-align: center;
8585
text-decoration: none;
86-
color: mix(#fff, $gray, 25%);
87-
border: 1px solid $light-gray;
86+
color: var(--global-text-color-light);
87+
border: 1px solid var(var(--global-border-color));
8888
border-radius: 0;
8989

9090
&:hover {
@@ -97,7 +97,7 @@
9797
}
9898

9999
&.disabled {
100-
color: mix(#fff, $gray, 75%);
100+
color: var(--global-text-color-light);
101101
pointer-events: none;
102102
cursor: not-allowed;
103103
}
@@ -131,8 +131,8 @@
131131
font-weight: bold;
132132
text-align: center;
133133
text-decoration: none;
134-
color: mix(#fff, $gray, 50%);
135-
border: 1px solid $light-gray;
134+
color: var(--global-text-color-light);
135+
border: 1px solid var(var(--global-border-color));
136136
border-radius: $border-radius;
137137

138138
&:hover {
@@ -151,7 +151,7 @@
151151
}
152152

153153
&.disabled {
154-
color: mix(#fff, $gray, 75%);
154+
color: var(--global-text-color-light);
155155
pointer-events: none;
156156
cursor: not-allowed;
157157
}
@@ -373,7 +373,7 @@
373373

374374
.toc {
375375
font-family: $sans-serif-narrow;
376-
color: $gray;
376+
color: var(--global-text-color-light);
377377
text-transform: uppercase;
378378
letter-spacing: 1px;
379379
background-color: #fff;
@@ -400,7 +400,7 @@
400400
a {
401401
display: block;
402402
padding: 0.5rem 1rem;
403-
color: $gray;
403+
color: var(--global-text-color-light);
404404
font-size: $type-size-7;
405405
font-weight: bold;
406406
line-height: 1.5;
@@ -409,7 +409,7 @@
409409

410410
&:hover {
411411
color: #000;
412-
background: $lighter-gray;
412+
background: var(--global-link-color-hover);
413413
}
414414
}
415415

‎_sass/layout/_notices.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
/* Default notice */
6767

6868
.notice {
69-
@include notice($light-gray);
69+
@include notice($notice-color);
7070
}
7171

7272
/* Primary notice */

‎_sass/layout/_page.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227

228228
.page__meta {
229229
margin-top: 2em;
230-
color: mix(#fff, $gray, 25%);
230+
color: var(--global-text-color-light);
231231
font-family: $sans-serif;
232232
font-size: $type-size-6;
233233

@@ -267,7 +267,7 @@
267267
margin-bottom: 8px;
268268
padding: 5px 10px;
269269
text-decoration: none;
270-
border: 1px solid $light-gray;
270+
border: 1px solid var(--global-border-color);
271271
border-radius: $border-radius;
272272

273273
&:hover {
@@ -296,7 +296,7 @@
296296

297297
.page__comments-form {
298298
padding: 1em;
299-
background: $lighter-gray;
299+
background: var(--global-border-color);
300300
transition: $global-transition;
301301

302302
&.disabled {

‎_sass/layout/_tables.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ table {
1616
}
1717

1818
thead {
19-
background-color: $light-gray;
19+
background-color: var(--global-border-color);
2020
border-bottom: 1px solid var(--global-border-color);
2121
}
2222

‎_sass/theme/_dark.scss

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
DARK THEME
33
========================================================================== */
44

5-
/* Color codes used throughout the site */
5+
/* Color codes used for the theme */
6+
$gray : #7a8288;
7+
$dark-gray : mix(#000, $gray, 40%);
8+
$darker-gray : mix(#000, $gray, 60%);
9+
$light-gray : mix(#fff, $gray, 50%);
10+
611
$background : #474747;
712
$background-light : mix(#fff, $background, 80%);
813
$background-lighter : mix(#fff, $background, 90%);

‎_sass/theme/_default.scss

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
DEFAULT THEME
33
========================================================================== */
44

5+
/* Color codes used for the theme */
6+
$gray : #7a8288;
7+
$dark-gray : mix(#000, $gray, 40%);
8+
$darker-gray : mix(#000, $gray, 60%);
9+
$light-gray : mix(#fff, $gray, 50%);
10+
$lighter-gray : mix(#fff, $gray, 90%);
11+
512
/* Color codes used for the site */
613
$danger-color : #ee5f5b;
714
$info-color : #2f7f93;

0 commit comments

Comments
 (0)