From 9ba9c999c97fe1cb2dade863171f3268d9b282c8 Mon Sep 17 00:00:00 2001 From: A Cottrill Date: Fri, 22 Nov 2024 21:06:30 -0500 Subject: [PATCH 01/10] fix: color defintion update --- common/color_definitions.scss | 2 ++ common/common.scss | 18 +++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/common/color_definitions.scss b/common/color_definitions.scss index da9cb42..c338314 100644 --- a/common/color_definitions.scss +++ b/common/color_definitions.scss @@ -58,4 +58,6 @@ $--gray00: mix($header_background, $header_primary, 0%); --blue-50: #198eee; --header_primary: #fff; --header_background: #0a0a23; + --fcc-highlight-mid: #{$fcc-highlight-mid}; + --fcc-highlight-background: #{fcc-highlight-background}; } diff --git a/common/common.scss b/common/common.scss index 68116dd..774c3a9 100644 --- a/common/common.scss +++ b/common/common.scss @@ -532,11 +532,11 @@ html.whos-online-ring.desktop-view body.user-page-online .primary img.avatar { //main page grid ---------------------------- td.poster-names a { - color: dark-light-choose($primary-medium, $secondary-medium); + color: dark-light-choose(var(--primary-medium), var(--secondary-medium)); } #whos-online { - color: dark-light-choose($primary-medium, $secondary-medium) !important; + color: dark-light-choose(var(--primary-medium), var(--secondary-medium)) !important; } //buttons ---------------------------- @@ -583,11 +583,11 @@ td.poster-names a { &.btn-danger { color: var(--fcc-quaternary-color); - background-color: $danger; + background-color: var(--danger); &:hover, &.btn-hover { - background-color: lighten($danger, 15%); + background-color: lighten(var(--danger), 15%); color: var(--fcc-quaternary-color); } } @@ -627,7 +627,7 @@ div.select-kit-header { #reply-control .btn-mini-toggle:hover, #reply-control .btn-mini-toggle:focus { .d-icon { - color: $secondary; + color: var(--secondary); } } @@ -674,7 +674,7 @@ div.select-kit-header { clear: both; margin-bottom: 5px; .combo-box .combo-box-header { - background: $secondary; + background: var(--secondary); color: var(--primary); border: 3px solid var(--primary); padding: 6px 12px; @@ -716,7 +716,7 @@ div.select-kit-header { .latest-topic-list-item.visited, .category-topic-link.visited { a.title:not(.badge-notification) { - color: var(--primary)-medium; + color: var(--primary-medium); } } @@ -730,12 +730,12 @@ div.select-kit-header { .anon & { a.title:visited:not(.badge-notification) { - color: var(--primary)-medium; + color: var(--primary-medium); } } a.title.visited:not(.badge-notification) { - color: var(--primary)-medium; + color: var(--primary-medium); } } From d1e77b36bbfa65e5bb9576ef4bd068ffac5abed8 Mon Sep 17 00:00:00 2001 From: A Cottrill Date: Fri, 22 Nov 2024 21:28:40 -0500 Subject: [PATCH 02/10] try to define extra variables --- common/color_definitions.scss | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/color_definitions.scss b/common/color_definitions.scss index c338314..1c05215 100644 --- a/common/color_definitions.scss +++ b/common/color_definitions.scss @@ -29,9 +29,8 @@ $--gray05: mix($header_background, $header_primary, 7%); $--gray00: mix($header_background, $header_primary, 0%); :root { - --primary: #{$primary}; - --secondary: #{$secondary}; - --tertiary: #{tertiary}; + --primary-low: #{$primary-low}; + --primary-very-low: #{$primary-very-low}; --fcc-primary-color: #{mix($primary, $secondary, 100%)}; --fcc-secondary-color: #{mix($primary, $secondary, 93%)}; --fcc-tertiary-color: #{mix($primary, $secondary, 87%)}; @@ -59,5 +58,5 @@ $--gray00: mix($header_background, $header_primary, 0%); --header_primary: #fff; --header_background: #0a0a23; --fcc-highlight-mid: #{$fcc-highlight-mid}; - --fcc-highlight-background: #{fcc-highlight-background}; + --fcc-highlight-background: #{$fcc-highlight-background}; } From 431c26d206b87c88c4051365f58dc026ec1012b2 Mon Sep 17 00:00:00 2001 From: A Cottrill Date: Fri, 22 Nov 2024 21:42:14 -0500 Subject: [PATCH 03/10] danger missing --- common/common.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/common.scss b/common/common.scss index 774c3a9..f5c3115 100644 --- a/common/common.scss +++ b/common/common.scss @@ -583,11 +583,11 @@ td.poster-names a { &.btn-danger { color: var(--fcc-quaternary-color); - background-color: var(--danger); + background-color: $danger; &:hover, &.btn-hover { - background-color: lighten(var(--danger), 15%); + background-color: lighten($danger, 15%); color: var(--fcc-quaternary-color); } } From 7feeb4f4ad26403ae746b370b0522a11dbed4847 Mon Sep 17 00:00:00 2001 From: A Cottrill Date: Fri, 22 Nov 2024 21:58:18 -0500 Subject: [PATCH 04/10] gray? --- common/color_definitions.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/color_definitions.scss b/common/color_definitions.scss index 1c05215..c4ee69e 100644 --- a/common/color_definitions.scss +++ b/common/color_definitions.scss @@ -43,13 +43,13 @@ $--gray00: mix($header_background, $header_primary, 0%); --fcc-highlight-color: #{$tertiary}; --secondary-header-background: #{mix($header_primary, $header_background, 93%)}; - --gray90: #{mix($header_background, $header_primary, 100%)}; + --gray90: #{$--gray90}; --gray85: #{mix($header_background, $header_primary, 93%)}; --gray75: #{mix($header_background, $header_primary, 80%)}; --gray65: #{mix($header_background, $header_primary, 67%)}; --gray45: #{mix($header_background, $header_primary, 50%)}; --gray05: #{mix($header_background, $header_primary, 7%)}; - --gray00: #{mix($header_background, $header_primary, 0%)}; + --gray00: #{$--gray00}; --fcc-d-hover: rgba(var(--primary), 0.08); From 212d2b042adefe4cb771cae50574da700a2864b6 Mon Sep 17 00:00:00 2001 From: A Cottrill Date: Fri, 22 Nov 2024 21:58:57 -0500 Subject: [PATCH 05/10] remove bad hover --- common/common.scss | 6 ------ 1 file changed, 6 deletions(-) diff --git a/common/common.scss b/common/common.scss index f5c3115..f8116bc 100644 --- a/common/common.scss +++ b/common/common.scss @@ -366,12 +366,6 @@ a.curriculum-nav { justify-content: center; } -a.curriculum-nav:hover, -a.curriculum-nav:focus { - color: var(--gray90); - background: var(--gray00); -} - .navigation-container { align-items: center; } From 84ce28efc06da87d795d698d9e3cfaa6ad825b6a Mon Sep 17 00:00:00 2001 From: A Cottrill Date: Fri, 22 Nov 2024 22:03:29 -0500 Subject: [PATCH 06/10] gray 10 --- common/color_definitions.scss | 1 + common/common.scss | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/common/color_definitions.scss b/common/color_definitions.scss index c4ee69e..769cf3e 100644 --- a/common/color_definitions.scss +++ b/common/color_definitions.scss @@ -48,6 +48,7 @@ $--gray00: mix($header_background, $header_primary, 0%); --gray75: #{mix($header_background, $header_primary, 80%)}; --gray65: #{mix($header_background, $header_primary, 67%)}; --gray45: #{mix($header_background, $header_primary, 50%)}; + --gray10: #{$gray10}; --gray05: #{mix($header_background, $header_primary, 7%)}; --gray00: #{$--gray00}; diff --git a/common/common.scss b/common/common.scss index f8116bc..dba1ca1 100644 --- a/common/common.scss +++ b/common/common.scss @@ -366,6 +366,12 @@ a.curriculum-nav { justify-content: center; } +a.curriculum-nav:hover, +a.curriculum-nav:focus { + color: var(--gray90); + background-color: var(--gray10); +} + .navigation-container { align-items: center; } From 86dba5bcb2b39a410c2fac7a8311842772466ba0 Mon Sep 17 00:00:00 2001 From: A Cottrill Date: Fri, 22 Nov 2024 22:03:59 -0500 Subject: [PATCH 07/10] fix typo --- common/color_definitions.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/color_definitions.scss b/common/color_definitions.scss index 769cf3e..fac2c04 100644 --- a/common/color_definitions.scss +++ b/common/color_definitions.scss @@ -48,7 +48,7 @@ $--gray00: mix($header_background, $header_primary, 0%); --gray75: #{mix($header_background, $header_primary, 80%)}; --gray65: #{mix($header_background, $header_primary, 67%)}; --gray45: #{mix($header_background, $header_primary, 50%)}; - --gray10: #{$gray10}; + --gray10: #{$--gray10}; --gray05: #{mix($header_background, $header_primary, 7%)}; --gray00: #{$--gray00}; From 78e10dab27819e9ddabe93b0509f7933ece3d3f4 Mon Sep 17 00:00:00 2001 From: A Cottrill Date: Fri, 22 Nov 2024 22:06:03 -0500 Subject: [PATCH 08/10] gray0 --- common/common.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/common.scss b/common/common.scss index dba1ca1..7d5c60c 100644 --- a/common/common.scss +++ b/common/common.scss @@ -369,7 +369,7 @@ a.curriculum-nav { a.curriculum-nav:hover, a.curriculum-nav:focus { color: var(--gray90); - background-color: var(--gray10); + background-color: var(--gray00); } .navigation-container { From a5b445ebce0bca0a0121cd818efc70a8f28786fc Mon Sep 17 00:00:00 2001 From: A Cottrill Date: Fri, 22 Nov 2024 22:08:44 -0500 Subject: [PATCH 09/10] highlight background? --- common/common.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/common.scss b/common/common.scss index 7d5c60c..3bb420f 100644 --- a/common/common.scss +++ b/common/common.scss @@ -369,7 +369,7 @@ a.curriculum-nav { a.curriculum-nav:hover, a.curriculum-nav:focus { color: var(--gray90); - background-color: var(--gray00); + background-color: var(--fcc-highlight-background); } .navigation-container { From 0540f462aa6a1cf5014368b38cae1aff10e8737e Mon Sep 17 00:00:00 2001 From: A Cottrill Date: Fri, 22 Nov 2024 22:32:40 -0500 Subject: [PATCH 10/10] proper color at last --- common/common.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/common.scss b/common/common.scss index 3bb420f..1d5f8d3 100644 --- a/common/common.scss +++ b/common/common.scss @@ -369,7 +369,7 @@ a.curriculum-nav { a.curriculum-nav:hover, a.curriculum-nav:focus { color: var(--gray90); - background-color: var(--fcc-highlight-background); + background-color: var(--secondary); } .navigation-container {