From 6bbc75f471a9b35037fdafeab65d03b81c7f1c1f Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Fri, 3 May 2024 14:31:24 +0200 Subject: [PATCH 01/11] enhance(curriculum): add margin above "Resources:" --- client/src/curriculum/module.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/curriculum/module.scss b/client/src/curriculum/module.scss index d7702f449630..b191b979759c 100644 --- a/client/src/curriculum/module.scss +++ b/client/src/curriculum/module.scss @@ -53,6 +53,7 @@ p.curriculum-resources { margin-bottom: 0.5rem; + margin-top: 2rem; + ul { padding-left: 2rem; From 4900fcc6e1879fd9d50fba3dbf192d1938b57a98 Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Fri, 3 May 2024 14:34:04 +0200 Subject: [PATCH 02/11] enhance(curriculum): use grey border on module hover --- client/src/ui/base/_themes.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/ui/base/_themes.scss b/client/src/ui/base/_themes.scss index 6ea376b6bb18..0e653090d10e 100644 --- a/client/src/ui/base/_themes.scss +++ b/client/src/ui/base/_themes.scss @@ -233,7 +233,7 @@ --curriculum-color-topic-practices: #{$mdn-color-light-theme-violet-60}; --curriculum-color-landing-laptop: #e3642a; --curriculum-border-color-list-item: #f2f1f1; - --curriculum-border-color-list-item-hover: rgba(227, 100, 42, 0.7); + --curriculum-border-color-list-item-hover: var(--text-inactive); --curriculum-bg-color-list-item-body: #fff; --curriculum-color-list-item-icon-topic-standards: #{$mdn-color-light-theme-red-60}; --curriculum-color-list-item-icon-topic-styling: #{$mdn-color-light-theme-blue-60}; @@ -511,7 +511,7 @@ --curriculum-color-landing-laptop: #b25c35; --curriculum-bg-color-list-item-body: #000; --curriculum-border-color-list-item: #4e4e4e; - --curriculum-border-color-list-item-hover: rgba(227, 100, 42, 0.7); + --curriculum-border-color-list-item-hover: var(--text-inactive); --curriculum-module-label-color: #e3642a; --curriculum-module-label-bg-color: #321d13; --curriculum-bg-color-list-item-topic-standards: #343434; From 3806ea036760fffaa303fe129d08bc7c7e1dbb67 Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Fri, 3 May 2024 14:35:08 +0200 Subject: [PATCH 03/11] enhance(curriculum): update notes background-color in dark theme --- client/src/ui/base/_themes.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/ui/base/_themes.scss b/client/src/ui/base/_themes.scss index 0e653090d10e..78512e159eea 100644 --- a/client/src/ui/base/_themes.scss +++ b/client/src/ui/base/_themes.scss @@ -494,7 +494,7 @@ --curriculum-color-topic-tooling: #8ff2a4; --curriculum-color-topic-practices: #c891f2; --curriculum-bg-color: #664b33; - --curriculum-bg-color-note: #321d13; + --curriculum-bg-color-note: #332e29; --curriculum-bg-large-color: #343434; --curriculum-bg-color-topic-standards: #994b53; --curriculum-bg-color-topic-styling: #4e609e; From b45e534bbd2e571ee86d38984d2234d34c43e93a Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Fri, 3 May 2024 14:35:52 +0200 Subject: [PATCH 04/11] enhance(curriculum): use same padding around notes --- client/src/curriculum/index.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/curriculum/index.scss b/client/src/curriculum/index.scss index 9350b0c34645..effb55cfecb7 100644 --- a/client/src/curriculum/index.scss +++ b/client/src/curriculum/index.scss @@ -228,7 +228,7 @@ border: 0; border-radius: var(--elem-radius); margin: 1rem; - padding: 0.5rem 2rem; + padding: 1rem; > :last-child { margin-bottom: 0; From 52dee7cea93789c4f19f7196f837ed5734be4032 Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Fri, 3 May 2024 14:37:24 +0200 Subject: [PATCH 05/11] enhance(curriculum): adjust ul/ol/p spacing in notes --- client/src/curriculum/index.scss | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/client/src/curriculum/index.scss b/client/src/curriculum/index.scss index effb55cfecb7..19aa80a0c992 100644 --- a/client/src/curriculum/index.scss +++ b/client/src/curriculum/index.scss @@ -230,6 +230,26 @@ margin: 1rem; padding: 1rem; + ol, + ul { + padding-left: 1rem; + + li:last-child { + margin-bottom: 0; + } + } + + ol, + ul, + p { + margin-top: 0.5rem; + } + + > p:first-child { + // The "Notes:" paragraph. + margin-top: 0; + } + > :last-child { margin-bottom: 0; } From 8b3b0425b982056490d5dd2099227370e43ab1ab Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Fri, 3 May 2024 14:51:30 +0200 Subject: [PATCH 06/11] enhance(curricullum): reduce margin below list --- client/src/curriculum/index.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/curriculum/index.scss b/client/src/curriculum/index.scss index 19aa80a0c992..135430dd497d 100644 --- a/client/src/curriculum/index.scss +++ b/client/src/curriculum/index.scss @@ -271,7 +271,7 @@ ol, ul { - margin: 1rem 0 2rem; + margin: 1rem 0; padding-left: 2rem; ol, From 1de0420c792cc86a82d61fe401b349d4a837e049 Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Fri, 3 May 2024 14:58:59 +0200 Subject: [PATCH 07/11] chore(curriculum): update background color --- client/src/ui/base/_themes.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/ui/base/_themes.scss b/client/src/ui/base/_themes.scss index 78512e159eea..8c0707cec509 100644 --- a/client/src/ui/base/_themes.scss +++ b/client/src/ui/base/_themes.scss @@ -493,7 +493,7 @@ --curriculum-color-topic-scripting: #f2cf8f; --curriculum-color-topic-tooling: #8ff2a4; --curriculum-color-topic-practices: #c891f2; - --curriculum-bg-color: #664b33; + --curriculum-bg-color: #413020; --curriculum-bg-color-note: #332e29; --curriculum-bg-large-color: #343434; --curriculum-bg-color-topic-standards: #994b53; From 078aa13f60f1fb98dc0f776b3ca92e24bfffc9d8 Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Fri, 3 May 2024 17:35:39 +0200 Subject: [PATCH 08/11] chore(curriculum): use bg color from label bg --- client/src/ui/base/_themes.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/ui/base/_themes.scss b/client/src/ui/base/_themes.scss index 8c0707cec509..18b86d07a3d8 100644 --- a/client/src/ui/base/_themes.scss +++ b/client/src/ui/base/_themes.scss @@ -493,7 +493,7 @@ --curriculum-color-topic-scripting: #f2cf8f; --curriculum-color-topic-tooling: #8ff2a4; --curriculum-color-topic-practices: #c891f2; - --curriculum-bg-color: #413020; + --curriculum-bg-color: #321d13; --curriculum-bg-color-note: #332e29; --curriculum-bg-large-color: #343434; --curriculum-bg-color-topic-standards: #994b53; From bd4d85f2ed73bb7a4a6a5b0ac250ccc753ef13de Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Fri, 3 May 2024 17:36:38 +0200 Subject: [PATCH 09/11] chore(curriculum): sync notes hue with bg-color --- client/src/ui/base/_themes.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/ui/base/_themes.scss b/client/src/ui/base/_themes.scss index 18b86d07a3d8..fc437d75dfc5 100644 --- a/client/src/ui/base/_themes.scss +++ b/client/src/ui/base/_themes.scss @@ -494,7 +494,7 @@ --curriculum-color-topic-tooling: #8ff2a4; --curriculum-color-topic-practices: #c891f2; --curriculum-bg-color: #321d13; - --curriculum-bg-color-note: #332e29; + --curriculum-bg-color-note: #332c29; --curriculum-bg-large-color: #343434; --curriculum-bg-color-topic-standards: #994b53; --curriculum-bg-color-topic-styling: #4e609e; From 9f53c0f8946caea41f3da5d901fc8990a6ed9bfe Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Sat, 15 Jun 2024 00:07:06 +0200 Subject: [PATCH 10/11] fixup! chore(curriculum): use bg color from label bg --- client/src/ui/base/_themes.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/ui/base/_themes.scss b/client/src/ui/base/_themes.scss index e71c67bd2678..c4c420ad8c7f 100644 --- a/client/src/ui/base/_themes.scss +++ b/client/src/ui/base/_themes.scss @@ -210,7 +210,7 @@ --baseline-limited-check: #1e8e3e; --baseline-limited-cross: #ea8600; - --curriculum-bg-color: #fcefe2; + --curriculum-bg-color: #faf0e3; --curriculum-bg-color-note: rgba(252, 239, 226, 0.5); --curriculum-bg-large-color: #fcefe2; --curriculum-bg-color-topic-standards: #{$mdn-color-light-theme-red-50}30; From e27232e8dc372610a6b6fc128c3c237e8298d2e3 Mon Sep 17 00:00:00 2001 From: Claas Augner <495429+caugner@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:50:42 +0200 Subject: [PATCH 11/11] fix(curriculum): revert --curiculum-bg-color in light theme --- client/src/ui/base/_themes.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/ui/base/_themes.scss b/client/src/ui/base/_themes.scss index c4c420ad8c7f..e71c67bd2678 100644 --- a/client/src/ui/base/_themes.scss +++ b/client/src/ui/base/_themes.scss @@ -210,7 +210,7 @@ --baseline-limited-check: #1e8e3e; --baseline-limited-cross: #ea8600; - --curriculum-bg-color: #faf0e3; + --curriculum-bg-color: #fcefe2; --curriculum-bg-color-note: rgba(252, 239, 226, 0.5); --curriculum-bg-large-color: #fcefe2; --curriculum-bg-color-topic-standards: #{$mdn-color-light-theme-red-50}30;