From aaf064b40fa93be74a5ea481ab7dd0b471df12a7 Mon Sep 17 00:00:00 2001 From: rjzupkoii Date: Sat, 1 Feb 2025 14:36:54 -0500 Subject: [PATCH] #137 updated border-color --- _sass/_archive.scss | 4 ++-- _sass/_base.scss | 2 +- _sass/_masthead.scss | 2 +- _sass/_navigation.scss | 14 +++++++------- _sass/_page.scss | 12 ++++++------ _sass/_sidebar.scss | 6 +++--- _sass/_syntax.scss | 2 +- _sass/_themes.scss | 20 +++++++++++--------- _sass/_utilities.scss | 4 ++-- _sass/_variables.scss | 8 -------- 10 files changed, 34 insertions(+), 40 deletions(-) diff --git a/_sass/_archive.scss b/_sass/_archive.scss index e978e7277e430..1e41ae3384068 100644 --- a/_sass/_archive.scss +++ b/_sass/_archive.scss @@ -32,7 +32,7 @@ padding-bottom: 0.5em; font-size: $type-size-5; color: mix(#fff, $gray, 25%); - border-bottom: 1px solid $border-color; + border-bottom: 1px solid var(--global-border-color); + .list__item .archive__item-title { margin-top: 0.5em; @@ -159,7 +159,7 @@ .feature__wrapper { @include clearfix(); margin-bottom: 2em; - border-bottom: 1px solid $border-color; + border-bottom: 1px solid var(--global-border-color); } .feature__item { diff --git a/_sass/_base.scss b/_sass/_base.scss index 3c162d4146ced..fe053b61d7ecf 100644 --- a/_sass/_base.scss +++ b/_sass/_base.scss @@ -160,7 +160,7 @@ hr { display: block; margin: 1em 0; border: 0; - border-top: 1px solid $border-color; + border-top: 1px solid var(--global-border-color); } /* lists */ diff --git a/_sass/_masthead.scss b/_sass/_masthead.scss index 467df09e7da96..058a88e9b511b 100644 --- a/_sass/_masthead.scss +++ b/_sass/_masthead.scss @@ -5,7 +5,7 @@ .masthead { position: fixed; background: white; - border-bottom: 1px solid $border-color; + border-bottom: 1px solid var(--global-border-color); height: $masthead-height; top: 0; width: 100%; diff --git a/_sass/_navigation.scss b/_sass/_navigation.scss index cb7ed3ffc513c..3e766a1b08657 100644 --- a/_sass/_navigation.scss +++ b/_sass/_navigation.scss @@ -164,7 +164,7 @@ .page__comments + .pagination { margin-top: 2em; padding-top: 2em; - border-top: 1px solid $border-color; + border-top: 1px solid var(--global-border-color); } @@ -257,7 +257,7 @@ right: 0; margin-top: 15px; padding: 5px; - border: 1px solid $border-color; + border: 1px solid var(--global-border-color); border-radius: $border-radius; background: #fff; box-shadow: 0 0 10px rgba(#000, 0.25); @@ -281,7 +281,7 @@ width: 0; border-style: solid; border-width: 0 10px 10px; - border-color: $border-color transparent; + border-color: var(--global-border-color) transparent; display: block; z-index: 0; } @@ -301,7 +301,7 @@ li { display: block; - border-bottom: 1px solid $border-color; + border-bottom: 1px solid var(--global-border-color); &:last-child { border-bottom: none; @@ -363,7 +363,7 @@ font-size: $type-size-6; font-weight: bold; text-transform: uppercase; - border-bottom: 1px solid $border-color; + border-bottom: 1px solid var(--global-border-color); } @@ -377,7 +377,7 @@ text-transform: uppercase; letter-spacing: 1px; background-color: #fff; - border: 1px solid $border-color; + border: 1px solid var(--global-border-color); border-radius: $border-radius; box-shadow: $box-shadow; @@ -404,7 +404,7 @@ font-size: $type-size-7; font-weight: bold; line-height: 1.5; - border-bottom: 1px solid $border-color; + border-bottom: 1px solid var(--global-border-color); text-decoration-line: none !important; &:hover { diff --git a/_sass/_page.scss b/_sass/_page.scss index b962a9d61a18f..76cf25d59c100 100644 --- a/_sass/_page.scss +++ b/_sass/_page.scss @@ -52,7 +52,7 @@ h2 { padding-bottom: 0.5em; - border-bottom: 1px solid $border-color; + border-bottom: 1px solid var(--global-border-color); } p, li, dl { @@ -198,7 +198,7 @@ .page__share { margin-top: 2em; padding-top: 1em; - border-top: 1px solid $border-color; + border-top: 1px solid var(--global-border-color); @include breakpoint(max-width $small) { .btn span { @@ -290,7 +290,7 @@ margin-bottom: 10px; padding-top: 2rem; font-size: $type-size-6; - border-top: 1px solid $border-color; + border-top: 1px solid var(--global-border-color); text-transform: uppercase; } @@ -318,7 +318,7 @@ margin: 1em 0; &:not(:last-child) { - border-bottom: 1px solid $border-color; + border-bottom: 1px solid var(--global-border-color); } } @@ -342,7 +342,7 @@ width: 80px; height: 80px; padding: 5px; - border: 1px solid $border-color; + border: 1px solid var(--global-border-color); } } @@ -380,7 +380,7 @@ .page__related { margin-top: 2em; padding-top: 1em; - border-top: 1px solid $border-color; + border-top: 1px solid var(--global-border-color); @include clearfix(); float: left; diff --git a/_sass/_sidebar.scss b/_sass/_sidebar.scss index 509f560161f2c..f3ad2d3979824 100644 --- a/_sass/_sidebar.scss +++ b/_sass/_sidebar.scss @@ -95,7 +95,7 @@ @include breakpoint($large) { padding: 5px; - border: 1px solid $border-color; + border: 1px solid var(--global-border-color); } } } @@ -188,7 +188,7 @@ margin-top: 15px; padding: 10px; list-style-type: none; - border: 1px solid $border-color; + border: 1px solid var(--global-border-color); border-radius: $border-radius; background: #fff; z-index: -1; @@ -214,7 +214,7 @@ width: 0; border-style: solid; border-width: 0 10px 10px; - border-color: $border-color transparent; + border-color: var(--global-border-color) transparent; z-index: 0; @include breakpoint($large) { diff --git a/_sass/_syntax.scss b/_sass/_syntax.scss index 55e8a88997dd2..0b567aa16d65e 100644 --- a/_sass/_syntax.scss +++ b/_sass/_syntax.scss @@ -6,7 +6,7 @@ div.highlighter-rouge, figure.highlight { position: relative; margin-bottom: 1em; padding: 1em; - border: 1px solid $border-color; + border: 1px solid var(--global-border-color); border-radius: $border-radius; background-color: $code-background-color; box-shadow: $box-shadow; diff --git a/_sass/_themes.scss b/_sass/_themes.scss index edd9055115c65..3a410be8a70e2 100644 --- a/_sass/_themes.scss +++ b/_sass/_themes.scss @@ -2,15 +2,17 @@ THEMES ========================================================================== */ -/* Default light theme for 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%); +/* 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%); +/* Default light theme for the site */ :root { - --global-bg-color: #fff; - --global-text-color: #{$dark-gray}; - --global-fig-caption-color: mix(#fff, #{$dark-gray}, 25%); + --global-bg-color : #fff; + --global-border-color : #{$lighter-gray}; + --global-fig-caption-color : mix(#fff, #{$dark-gray}, 25%); + --global-text-color : #{$dark-gray}; } \ No newline at end of file diff --git a/_sass/_utilities.scss b/_sass/_utilities.scss index e71e861af4de4..837b9d0501a2a 100644 --- a/_sass/_utilities.scss +++ b/_sass/_utilities.scss @@ -446,7 +446,7 @@ body:hover .visually-hidden button { min-height: 0; z-index: 9999; background: #fff; - border: 1px solid $border-color; + border: 1px solid var(--global-border-color); border-radius: $border-radius; box-shadow: $box-shadow; @@ -461,7 +461,7 @@ body:hover .visually-hidden button { &__actions { padding: 0.5em 1em; - border-top: 1px solid $border-color; + border-top: 1px solid var(--global-border-color); } } diff --git a/_sass/_variables.scss b/_sass/_variables.scss index 87685e0539d89..337d471cab91f 100644 --- a/_sass/_variables.scss +++ b/_sass/_variables.scss @@ -55,16 +55,8 @@ $sidebar-link-max-width : 250px; Colors ========================================================================== */ -$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%); - -$body-color : #fff; $code-background-color : #fafafa; $code-background-color-dark : $light-gray; -$border-color : $lighter-gray; $primary-color : #7a8288; $success-color : #62c462;