From f9d62ac0ad852355b2864efabc71d2c99b1ef187 Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Fri, 3 May 2024 14:03:56 +0200 Subject: [PATCH 1/4] fix(curriculum): increase --text-inactive contrast Light theme: 4.51 Dark theme: 4.57 --- client/src/ui/_vars.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/ui/_vars.scss b/client/src/ui/_vars.scss index 5f09b694fa98..110d9eef541d 100644 --- a/client/src/ui/_vars.scss +++ b/client/src/ui/_vars.scss @@ -156,7 +156,7 @@ $mdn-color-ads: #00d0aa; $mdn-theme-light-text-primary: $mdn-color-neutral-90; $mdn-theme-light-text-secondary: $mdn-color-neutral-70; $mdn-theme-light-text-active: #{$mdn-color-neutral-50}; -$mdn-theme-light-text-inactive: #{$mdn-color-neutral-40}a6; +$mdn-theme-light-text-inactive: #{$mdn-color-neutral-60}e8; $mdn-theme-light-text-link: $mdn-color-light-theme-blue-60; $mdn-theme-light-text-invert: $mdn-color-white; $mdn-theme-light-text-muted: #6f6f6f; @@ -204,7 +204,7 @@ $mdn-theme-light-code-background-block: $mdn-color-neutral-light-80; $mdn-theme-dark-text-primary: $mdn-color-white; $mdn-theme-dark-text-secondary: $mdn-color-neutral-20; $mdn-theme-dark-text-active: #{$mdn-color-neutral-50}; -$mdn-theme-dark-text-inactive: #{$mdn-color-neutral-20}a6; +$mdn-theme-dark-text-inactive: #{$mdn-color-neutral-50}e8; $mdn-theme-dark-text-link: $mdn-color-dark-theme-blue-30; $mdn-theme-dark-text-invert: $mdn-color-neutral-90; $mdn-theme-dark-text-muted: #858585; From d283a634c81ee52be9a3d27d2fa82e6c4e81da97 Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Fri, 3 May 2024 18:02:07 +0200 Subject: [PATCH 2/4] chore(curriculum): use --text-secondary + opacity --- client/src/curriculum/modules-list.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/curriculum/modules-list.scss b/client/src/curriculum/modules-list.scss index 00c9967394a7..f95a14749ff0 100644 --- a/client/src/curriculum/modules-list.scss +++ b/client/src/curriculum/modules-list.scss @@ -63,8 +63,9 @@ } > label { - color: var(--text-inactive); + color: var(--text-secondary); cursor: pointer; + opacity: 0.775; width: max-content; } From ce8828e1662b8b4d68b4dca2493a23811fad9a10 Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Mon, 20 May 2024 10:50:28 -0400 Subject: [PATCH 3/4] revert: revert text-inactive color change --- client/src/ui/_vars.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/ui/_vars.scss b/client/src/ui/_vars.scss index 110d9eef541d..5f09b694fa98 100644 --- a/client/src/ui/_vars.scss +++ b/client/src/ui/_vars.scss @@ -156,7 +156,7 @@ $mdn-color-ads: #00d0aa; $mdn-theme-light-text-primary: $mdn-color-neutral-90; $mdn-theme-light-text-secondary: $mdn-color-neutral-70; $mdn-theme-light-text-active: #{$mdn-color-neutral-50}; -$mdn-theme-light-text-inactive: #{$mdn-color-neutral-60}e8; +$mdn-theme-light-text-inactive: #{$mdn-color-neutral-40}a6; $mdn-theme-light-text-link: $mdn-color-light-theme-blue-60; $mdn-theme-light-text-invert: $mdn-color-white; $mdn-theme-light-text-muted: #6f6f6f; @@ -204,7 +204,7 @@ $mdn-theme-light-code-background-block: $mdn-color-neutral-light-80; $mdn-theme-dark-text-primary: $mdn-color-white; $mdn-theme-dark-text-secondary: $mdn-color-neutral-20; $mdn-theme-dark-text-active: #{$mdn-color-neutral-50}; -$mdn-theme-dark-text-inactive: #{$mdn-color-neutral-50}e8; +$mdn-theme-dark-text-inactive: #{$mdn-color-neutral-20}a6; $mdn-theme-dark-text-link: $mdn-color-dark-theme-blue-30; $mdn-theme-dark-text-invert: $mdn-color-neutral-90; $mdn-theme-dark-text-muted: #858585; From 08c0bbd8ef147fea9ce594067d03e763bae35365 Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Mon, 20 May 2024 15:02:30 -0400 Subject: [PATCH 4/4] fix(curriculum): apply color/opacity only to inactive modules --- client/src/curriculum/modules-list.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/client/src/curriculum/modules-list.scss b/client/src/curriculum/modules-list.scss index f95a14749ff0..622c1a38765b 100644 --- a/client/src/curriculum/modules-list.scss +++ b/client/src/curriculum/modules-list.scss @@ -62,10 +62,13 @@ outline-style: auto; } - > label { + > input:not(:checked) + label { color: var(--text-secondary); - cursor: pointer; opacity: 0.775; + } + + > label { + cursor: pointer; width: max-content; }