Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…s#1031 cleaning up remainder of direct references to theme colors
  • Loading branch information
rjzupkoii committed Feb 2, 2025
1 parent 83a76ed commit 0ccd873
Show file tree
Hide file tree
Showing 14 changed files with 39 additions and 33 deletions.
2 changes: 1 addition & 1 deletion _sass/_syntax.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ div.highlighter-rouge, figure.highlight {
top: 0;
right: 0;
padding: 0.5em;
background-color: $lighter-gray;
background-color: mix(#fff, #7a8288, 90%);
content: "\f121";
font-family: "Font Awesome 6 Free" !important;
font-size: $type-size-6;
Expand Down
9 changes: 1 addition & 8 deletions _sass/_themes.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
/* ==========================================================================
COMMON COLOR CODES
SHARED THEME SETTINGS
========================================================================== */

/* Color codes used throughout the site */
$gray : #7a8288;
$dark-gray : mix(#000, $gray, 40%);
$darker-gray : mix(#000, $gray, 60%);
$light-gray : mix(#fff, $gray, 50%);
$lighter-gray : mix(#fff, $gray, 90%);

/* ==========================================================================
TYPOGRAPHY
========================================================================== */
Expand Down
2 changes: 1 addition & 1 deletion _sass/include/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ body:hover .visually-hidden button {
}

a.reversefootnote {
color: $gray;
color: var(--global-text-color-light);
text-decoration: none;

&:hover {
Expand Down
2 changes: 1 addition & 1 deletion _sass/layout/_archive.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
margin: 1.414em 0 0;
padding-bottom: 0.5em;
font-size: $type-size-5;
color: mix(#fff, $gray, 25%);
color: var(--global-text-color-light);
border-bottom: 1px solid var(--global-border-color);

+ .list__item .archive__item-title {
Expand Down
4 changes: 2 additions & 2 deletions _sass/layout/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ td > code {
padding-bottom: 0.1rem;
font-size: $type-size-6;
background: var(--global-code-background-color);
border: 1px solid $lighter-gray;
border: 1px solid var(--global-thead-color);
border-radius: $border-radius;
box-shadow: $box-shadow;
color: var(--global-code-text-color);
Expand Down Expand Up @@ -248,7 +248,7 @@ figcaption {
a {
color: inherit;
text-decoration: none;
border-bottom: 1px solid $light-gray;
border-bottom: 1px solid var(--global-border-color );
-webkit-transition: $global-transition;
transition: $global-transition;

Expand Down
6 changes: 3 additions & 3 deletions _sass/layout/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
/* for dark backgrounds */

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

&:hover {
color: #fff !important;
border-color: $gray;
border-color: var(--global-text-color-light);
}
}

Expand Down
4 changes: 2 additions & 2 deletions _sass/layout/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
animation: intro 0.3s both;
-webkit-animation-delay: 0.45s;
animation-delay: 0.45s;
border-top: 1px solid $light-gray;
border-top: 1px solid var(var(--global-border-color));

footer {
@include clearfix;
Expand Down Expand Up @@ -53,7 +53,7 @@
.fab,
.far,
.fal {
color: mix(#fff, $gray, 25%);
color: var(--global-text-color-light);
}
}

Expand Down
1 change: 1 addition & 0 deletions _sass/layout/_masthead.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
}

.masthead__menu-item {
background-color: var(--global-bg-color);
display: block;
list-style-type: none;
white-space: nowrap;
Expand Down
18 changes: 9 additions & 9 deletions _sass/layout/_navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
line-height: 1.5;
text-align: center;
text-decoration: none;
color: mix(#fff, $gray, 25%);
border: 1px solid $light-gray;
color: var(--global-text-color-light);
border: 1px solid var(var(--global-border-color));
border-radius: 0;

&:hover {
Expand All @@ -97,7 +97,7 @@
}

&.disabled {
color: mix(#fff, $gray, 75%);
color: var(--global-text-color-light);
pointer-events: none;
cursor: not-allowed;
}
Expand Down Expand Up @@ -131,8 +131,8 @@
font-weight: bold;
text-align: center;
text-decoration: none;
color: mix(#fff, $gray, 50%);
border: 1px solid $light-gray;
color: var(--global-text-color-light);
border: 1px solid var(var(--global-border-color));
border-radius: $border-radius;

&:hover {
Expand All @@ -151,7 +151,7 @@
}

&.disabled {
color: mix(#fff, $gray, 75%);
color: var(--global-text-color-light);
pointer-events: none;
cursor: not-allowed;
}
Expand Down Expand Up @@ -373,7 +373,7 @@

.toc {
font-family: $sans-serif-narrow;
color: $gray;
color: var(--global-text-color-light);
text-transform: uppercase;
letter-spacing: 1px;
background-color: #fff;
Expand All @@ -400,7 +400,7 @@
a {
display: block;
padding: 0.5rem 1rem;
color: $gray;
color: var(--global-text-color-light);
font-size: $type-size-7;
font-weight: bold;
line-height: 1.5;
Expand All @@ -409,7 +409,7 @@

&:hover {
color: #000;
background: $lighter-gray;
background: var(--global-link-color-hover);
}
}

Expand Down
2 changes: 1 addition & 1 deletion _sass/layout/_notices.scss
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
/* Default notice */

.notice {
@include notice($light-gray);
@include notice($notice-color);
}

/* Primary notice */
Expand Down
6 changes: 3 additions & 3 deletions _sass/layout/_page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@

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

Expand Down Expand Up @@ -267,7 +267,7 @@
margin-bottom: 8px;
padding: 5px 10px;
text-decoration: none;
border: 1px solid $light-gray;
border: 1px solid var(--global-border-color);
border-radius: $border-radius;

&:hover {
Expand Down Expand Up @@ -296,7 +296,7 @@

.page__comments-form {
padding: 1em;
background: $lighter-gray;
background: var(--global-border-color);
transition: $global-transition;

&.disabled {
Expand Down
2 changes: 1 addition & 1 deletion _sass/layout/_tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ table {
}

thead {
background-color: $light-gray;
background-color: var(--global-border-color);
border-bottom: 1px solid var(--global-border-color);
}

Expand Down
7 changes: 6 additions & 1 deletion _sass/theme/_dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
DARK THEME
========================================================================== */

/* Color codes used throughout the site */
/* Color codes used for the theme */
$gray : #7a8288;
$dark-gray : mix(#000, $gray, 40%);
$darker-gray : mix(#000, $gray, 60%);
$light-gray : mix(#fff, $gray, 50%);

$background : #474747;
$background-light : mix(#fff, $background, 80%);
$background-lighter : mix(#fff, $background, 90%);
Expand Down
7 changes: 7 additions & 0 deletions _sass/theme/_default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
DEFAULT THEME
========================================================================== */

/* Color codes used for the theme */
$gray : #7a8288;
$dark-gray : mix(#000, $gray, 40%);
$darker-gray : mix(#000, $gray, 60%);
$light-gray : mix(#fff, $gray, 50%);
$lighter-gray : mix(#fff, $gray, 90%);

/* Color codes used for the site */
$danger-color : #ee5f5b;
$info-color : #2f7f93;
Expand Down

0 comments on commit 0ccd873

Please sign in to comment.