Skip to content

Commit c755f3e

Browse files
authored
Merge pull request #2952 from Samir-Rashid/fix-theme-color-regressions
Fix theme color regressions
2 parents 3d078df + b755aea commit c755f3e

File tree

5 files changed

+21
-10
lines changed

5 files changed

+21
-10
lines changed

_sass/layout/_base.scss

+9-2
Original file line numberDiff line numberDiff line change
@@ -139,23 +139,30 @@ a > code,
139139
figcaption > code,
140140
li > code,
141141
p > code,
142-
pre > code,
143142
td > code {
143+
color: var(--global-code-text-color);
144144
padding-top: 0.1rem;
145145
padding-bottom: 0.1rem;
146146
font-size: $type-size-6;
147147
background: var(--global-code-background-color);
148148
border: 1px solid var(--global-thead-color);
149149
border-radius: $border-radius;
150150
box-shadow: $box-shadow;
151-
color: var(--global-code-text-color);
152151

153152
&:before, &:after {
154153
letter-spacing: -0.2em;
155154
content: "\00a0"; /* non-breaking space*/
156155
}
157156
}
158157

158+
a > code {
159+
color: inherit;
160+
}
161+
162+
pre > code {
163+
color: var(--global-code-text-color);
164+
}
165+
159166
/* horizontal rule */
160167

161168
hr {

_sass/layout/_footer.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
.page__footer {
66
@include clearfix;
7-
background-color: var(--global-bg-color);
7+
background-color: var(--global-footer-bg-color);
88
color: var(--global-text-color-light);
99

1010
float: left;
@@ -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 var(var(--global-border-color));
28+
border-top: 1px solid var(--global-dark-border-color);
2929

3030
footer {
3131
@include clearfix;

_sass/layout/_navigation.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
text-align: center;
8585
text-decoration: none;
8686
color: var(--global-text-color-light);
87-
border: 1px solid var(var(--global-border-color));
87+
border: 1px solid var(--global-border-color);
8888
border-radius: 0;
8989

9090
&:hover {
@@ -132,7 +132,7 @@
132132
text-align: center;
133133
text-decoration: none;
134134
color: var(--global-text-color-light);
135-
border: 1px solid var(var(--global-border-color));
135+
border: 1px solid var(--global-border-color);
136136
border-radius: $border-radius;
137137

138138
&:hover {
@@ -409,7 +409,7 @@
409409
a {
410410
display: block;
411411
padding: 0.5rem 1rem;
412-
color: var(--global-text-color-light);
412+
color: var(--global-code-text-color);
413413
font-size: $type-size-7;
414414
font-weight: bold;
415415
line-height: 1.5;

_sass/theme/_dark.scss

+3-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ $sidebar-screen-min-width : 1024px;
3737
html[data-theme="dark"] {
3838
--global-base-color : #{$background};
3939
--global-bg-color : #{$background};
40-
--global-border-color : #{$background-light};
40+
--global-footer-bg-color : #{$background};
41+
--global-border-color : #{$light-gray};
42+
--global-dark-border-color : #{$background-light};
4143
--global-code-background-color : #fafafa;
4244
--global-code-text-color : #{$darker-gray};
4345
--global-fig-caption-color : #{$dark-gray};

_sass/theme/_default.scss

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
$gray : #7a8288;
77
$dark-gray : mix(#000, $gray, 40%);
88
$darker-gray : mix(#000, $gray, 60%);
9-
$light-gray : mix(#fff, $gray, 50%);
9+
$light-gray : #9ba1a6;
1010
$lighter-gray : mix(#fff, $gray, 90%);
1111

1212
/* Color codes used for the site */
@@ -30,11 +30,13 @@ $sidebar-screen-min-width : 1024px;
3030
:root {
3131
--global-base-color : #{$gray};
3232
--global-bg-color : #fff;
33+
--global-footer-bg-color : #f2f3f3;
3334
--global-border-color : #{$lighter-gray};
35+
--global-dark-border-color : #bdc1c4;
3436
--global-code-background-color : #fafafa;
3537
--global-code-text-color : #{$darker-gray};
3638
--global-fig-caption-color : mix(#fff, #{$dark-gray}, 25%);
37-
--global-link-color : #2f7f93;
39+
--global-link-color : #52adc8;
3840
--global-link-color-hover : mix(#000, #2f7f93, 25%);
3941
--global-link-color-visited : mix(#fff, #2f7f93, 25%);
4042
--global-masthead-link-color : #{$dark-gray};

0 commit comments

Comments
 (0)