From bdf628282e0ff14a52b578a65645a463deddfc6e Mon Sep 17 00:00:00 2001 From: mrgarris0n Date: Tue, 14 May 2024 15:32:40 +0200 Subject: [PATCH 1/4] OID skin added to conform OID branding guidelines Signed-off-by: mrgarris0n --- .../minimal-mistakes/skins/_oid.scss | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 _sass/minimal-mistakes/minimal-mistakes/skins/_oid.scss diff --git a/_sass/minimal-mistakes/minimal-mistakes/skins/_oid.scss b/_sass/minimal-mistakes/minimal-mistakes/skins/_oid.scss new file mode 100644 index 00000000..2b05f694 --- /dev/null +++ b/_sass/minimal-mistakes/minimal-mistakes/skins/_oid.scss @@ -0,0 +1,46 @@ +/* ========================================================================== + OID skin + ========================================================================== */ + +/* Colors */ +$oid-gray : #40535d !default; +$oid-black : #162c36 !default; +$oid-blue : #04aada !default; +$quest-orange : #fb4f14 !default; +$jaffa : #ee8a54 !default; +$nepal : #82a7c5 !default; + +$gray : $oid-gray !default; +$black : $oid-black !default; +$white : white !default; + +$dark-gray : mix($black, $gray, 40%) !default; +$darker-gray : mix($black, $gray, 60%) !default; +$light-gray : mix($white, $gray, 50%) !default; +$lighter-gray : mix($white, $gray, 90%) !default; + +$body-color : $white !default; +$background-color : #f0fff0 !default; +$code-background-color : $lighter-gray !default; +$code-background-color-dark : $light-gray !default; +$text-color : $oid-black !default; +$border-color : $lighter-gray !default; + +$primary-color : $oid-black !default; +$success-color : #27ae60 !default; +$warning-color : $jaffa !default; +$danger-color : $quest-orange !default; +$info-color : $nepal !default; + +/* links */ +$link-color : $oid-blue !default; +$link-color-hover : mix($black, $link-color, 25%) !default; +$link-color-visited : mix($white, $link-color, 25%) !default; +$masthead-link-color : $primary-color !default; +$masthead-link-color-hover : mix($black, $primary-color, 25%) !default; +$menuitem-hovered-background-color :$oid-blue !default; +$menuitem-selected-background-color: $oid-gray !default; + +/* notices */ +$notice-background-mix: 80% !default; +$code-notice-background-mix: 95% !default; From 59a3fd7d6fe4219024f21cd8898b683221c76538 Mon Sep 17 00:00:00 2001 From: mrgarris0n Date: Tue, 14 May 2024 15:57:25 +0200 Subject: [PATCH 2/4] Tooltip and footer colors Signed-off-by: mrgarris0n More footer colors Signed-off-by: mrgarris0n --- _sass/minimal-mistakes/minimal-mistakes/skins/_oid.scss | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/_sass/minimal-mistakes/minimal-mistakes/skins/_oid.scss b/_sass/minimal-mistakes/minimal-mistakes/skins/_oid.scss index 2b05f694..2b8709dd 100644 --- a/_sass/minimal-mistakes/minimal-mistakes/skins/_oid.scss +++ b/_sass/minimal-mistakes/minimal-mistakes/skins/_oid.scss @@ -25,6 +25,11 @@ $code-background-color : $lighter-gray !default; $code-background-color-dark : $light-gray !default; $text-color : $oid-black !default; $border-color : $lighter-gray !default; +$footer-background-color : mix($oid-blue, $background-color, 60%) !default; + +$tooltip-color : mix($gray, $text-color, 50%) !default; +$tooltip-background-color : rgba(mix($light-gray, $background-color, 7%), 0.925) !default; +$tooltip-arrow-background-color : rgba(mix($tooltip-background-color, $tooltip-color, 90%), 0.925) !default; $primary-color : $oid-black !default; $success-color : #27ae60 !default; @@ -42,5 +47,5 @@ $menuitem-hovered-background-color :$oid-blue !default; $menuitem-selected-background-color: $oid-gray !default; /* notices */ -$notice-background-mix: 80% !default; +$notice-background-mix: 60% !default; $code-notice-background-mix: 95% !default; From 0c950b9c4e0e3a5800e9b4d042e8db49332672b7 Mon Sep 17 00:00:00 2001 From: mrgarris0n Date: Thu, 16 May 2024 11:24:29 +0200 Subject: [PATCH 3/4] Title and heading colors, code blocks Signed-off-by: mrgarris0n --- .../minimal-mistakes/skins/_oid.scss | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/_sass/minimal-mistakes/minimal-mistakes/skins/_oid.scss b/_sass/minimal-mistakes/minimal-mistakes/skins/_oid.scss index 2b8709dd..4016df7f 100644 --- a/_sass/minimal-mistakes/minimal-mistakes/skins/_oid.scss +++ b/_sass/minimal-mistakes/minimal-mistakes/skins/_oid.scss @@ -20,7 +20,7 @@ $light-gray : mix($white, $gray, 50%) !default; $lighter-gray : mix($white, $gray, 90%) !default; $body-color : $white !default; -$background-color : #f0fff0 !default; +$background-color : $white !default; $code-background-color : $lighter-gray !default; $code-background-color-dark : $light-gray !default; $text-color : $oid-black !default; @@ -48,4 +48,33 @@ $menuitem-selected-background-color: $oid-gray !default; /* notices */ $notice-background-mix: 60% !default; -$code-notice-background-mix: 95% !default; +$code-notice-background-mix: 65% !default; + +$base01 : $oid-blue !default; + +.page__title { + a { + color: $link-color !important; + } +} + +h1, +h2, +h3, +h4, +h5, +h6 { + color: $link-color !important; +} + +.toc { + h4 { + color: $text-color !important; + } +} + +.highlight-header { + .btn { + color: $text-color !important; + } +} \ No newline at end of file From 3dd959f3e05cf7f73df9f801660b8d5f7933a3fb Mon Sep 17 00:00:00 2001 From: mrgarris0n Date: Tue, 21 May 2024 17:03:55 +0200 Subject: [PATCH 4/4] Review request: using variables instead of rule overrides Signed-off-by: mrgarris0n --- .../minimal-mistakes/_base.scss | 1 + .../minimal-mistakes/_navigation.scss | 1 + .../minimal-mistakes/_page.scss | 2 +- .../minimal-mistakes/_syntax.scss | 2 +- .../minimal-mistakes/_variables.scss | 5 ++ .../minimal-mistakes/skins/_oi-light.scss | 33 ++------ .../minimal-mistakes/skins/_oid.scss | 80 ------------------- 7 files changed, 14 insertions(+), 110 deletions(-) delete mode 100644 _sass/minimal-mistakes/minimal-mistakes/skins/_oid.scss diff --git a/_sass/minimal-mistakes/minimal-mistakes/_base.scss b/_sass/minimal-mistakes/minimal-mistakes/_base.scss index 2bc5a9fb..b1559fe0 100644 --- a/_sass/minimal-mistakes/minimal-mistakes/_base.scss +++ b/_sass/minimal-mistakes/minimal-mistakes/_base.scss @@ -27,6 +27,7 @@ h3, h4, h5, h6 { + color: $heading-color; margin: 2em 0 0.5em; line-height: 1.2; font-family: $header-font-family; diff --git a/_sass/minimal-mistakes/minimal-mistakes/_navigation.scss b/_sass/minimal-mistakes/minimal-mistakes/_navigation.scss index 1a453a5e..0eab33f1 100644 --- a/_sass/minimal-mistakes/minimal-mistakes/_navigation.scss +++ b/_sass/minimal-mistakes/minimal-mistakes/_navigation.scss @@ -901,6 +901,7 @@ } h4 { + color: $toc-header-color; margin-top: 0; margin-bottom: 0; } } diff --git a/_sass/minimal-mistakes/minimal-mistakes/_page.scss b/_sass/minimal-mistakes/minimal-mistakes/_page.scss index b61817ba..55336311 100644 --- a/_sass/minimal-mistakes/minimal-mistakes/_page.scss +++ b/_sass/minimal-mistakes/minimal-mistakes/_page.scss @@ -89,7 +89,7 @@ body { line-height: 1; a { - color: $text-color; + color: $page-title-color; text-decoration: none; } diff --git a/_sass/minimal-mistakes/minimal-mistakes/_syntax.scss b/_sass/minimal-mistakes/minimal-mistakes/_syntax.scss index 334c171f..ac5a8a3d 100644 --- a/_sass/minimal-mistakes/minimal-mistakes/_syntax.scss +++ b/_sass/minimal-mistakes/minimal-mistakes/_syntax.scss @@ -75,7 +75,7 @@ figure.highlight { margin: 0; padding: 0; outline: none; - color: $link-color; + color: $code-header-text-color; background-color: transparent; font-size: 1em; diff --git a/_sass/minimal-mistakes/minimal-mistakes/_variables.scss b/_sass/minimal-mistakes/minimal-mistakes/_variables.scss index 4414e0b7..b746efd7 100644 --- a/_sass/minimal-mistakes/minimal-mistakes/_variables.scss +++ b/_sass/minimal-mistakes/minimal-mistakes/_variables.scss @@ -106,6 +106,10 @@ $tooltip-color: mix($gray, $text-color, 50%) !default; $tooltip-box-shadow-color: $box-shadow-color !default; // rgba(mix($black, $background-color, 70%), 0.5) !default; //$tooltip-border-color: $border-color !default; // rgba(mix($black, $background-color, 80%), 0.9) !default; +$page-title-color: $text-color !default; +$heading-color: $text-color !default; +$toc-header-color: $menuitem-color !default; + /* YIQ color contrast */ $yiq-contrasted-dark-default: $dark-gray !default; $yiq-contrasted-light-default: $white !default; @@ -146,6 +150,7 @@ $link-color-selected: $selection-color !default; $masthead-link-color: $primary-color !default; $masthead-link-color-hover: mix($black, $primary-color, 25%) !default; $navicon-link-color-hover: mix($white, $primary-color, 75%) !default; +$code-header-text-color: $link-color !default; /* notices */ $notice-background-mix: 80% !default; diff --git a/_sass/minimal-mistakes/minimal-mistakes/skins/_oi-light.scss b/_sass/minimal-mistakes/minimal-mistakes/skins/_oi-light.scss index 4a72d311..8a1fe774 100644 --- a/_sass/minimal-mistakes/minimal-mistakes/skins/_oi-light.scss +++ b/_sass/minimal-mistakes/minimal-mistakes/skins/_oi-light.scss @@ -1,5 +1,5 @@ /* ========================================================================== - OID skin + OI Light skin ========================================================================== */ /* Colors */ @@ -45,36 +45,13 @@ $masthead-link-color : $primary-color !default; $masthead-link-color-hover : mix($black, $primary-color, 25%) !default; $menuitem-hovered-background-color :$oid-blue !default; $menuitem-selected-background-color: $oid-gray !default; +$heading-color: $link-color !default; +$page-title-color: $link-color !default; +$code-header-text-color: $text-color !default; +$toc-header-color: $text-color !default; /* notices */ $notice-background-mix: 60% !default; $code-notice-background-mix: 65% !default; $base01 : $oid-blue !default; - -.page__title { - a { - color: $link-color !important; - } -} - -h1, -h2, -h3, -h4, -h5, -h6 { - color: $link-color !important; -} - -.toc { - h4 { - color: $text-color !important; - } -} - -.highlight-header { - .btn { - color: $text-color !important; - } -} diff --git a/_sass/minimal-mistakes/minimal-mistakes/skins/_oid.scss b/_sass/minimal-mistakes/minimal-mistakes/skins/_oid.scss deleted file mode 100644 index 4016df7f..00000000 --- a/_sass/minimal-mistakes/minimal-mistakes/skins/_oid.scss +++ /dev/null @@ -1,80 +0,0 @@ -/* ========================================================================== - OID skin - ========================================================================== */ - -/* Colors */ -$oid-gray : #40535d !default; -$oid-black : #162c36 !default; -$oid-blue : #04aada !default; -$quest-orange : #fb4f14 !default; -$jaffa : #ee8a54 !default; -$nepal : #82a7c5 !default; - -$gray : $oid-gray !default; -$black : $oid-black !default; -$white : white !default; - -$dark-gray : mix($black, $gray, 40%) !default; -$darker-gray : mix($black, $gray, 60%) !default; -$light-gray : mix($white, $gray, 50%) !default; -$lighter-gray : mix($white, $gray, 90%) !default; - -$body-color : $white !default; -$background-color : $white !default; -$code-background-color : $lighter-gray !default; -$code-background-color-dark : $light-gray !default; -$text-color : $oid-black !default; -$border-color : $lighter-gray !default; -$footer-background-color : mix($oid-blue, $background-color, 60%) !default; - -$tooltip-color : mix($gray, $text-color, 50%) !default; -$tooltip-background-color : rgba(mix($light-gray, $background-color, 7%), 0.925) !default; -$tooltip-arrow-background-color : rgba(mix($tooltip-background-color, $tooltip-color, 90%), 0.925) !default; - -$primary-color : $oid-black !default; -$success-color : #27ae60 !default; -$warning-color : $jaffa !default; -$danger-color : $quest-orange !default; -$info-color : $nepal !default; - -/* links */ -$link-color : $oid-blue !default; -$link-color-hover : mix($black, $link-color, 25%) !default; -$link-color-visited : mix($white, $link-color, 25%) !default; -$masthead-link-color : $primary-color !default; -$masthead-link-color-hover : mix($black, $primary-color, 25%) !default; -$menuitem-hovered-background-color :$oid-blue !default; -$menuitem-selected-background-color: $oid-gray !default; - -/* notices */ -$notice-background-mix: 60% !default; -$code-notice-background-mix: 65% !default; - -$base01 : $oid-blue !default; - -.page__title { - a { - color: $link-color !important; - } -} - -h1, -h2, -h3, -h4, -h5, -h6 { - color: $link-color !important; -} - -.toc { - h4 { - color: $text-color !important; - } -} - -.highlight-header { - .btn { - color: $text-color !important; - } -} \ No newline at end of file