Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhance(curriculum): improve design #11064

Merged
merged 12 commits into from
Jul 8, 2024
Merged

enhance(curriculum): improve design #11064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6bbc75f
enhance(curriculum): add margin above "Resources:"
caugner May 3, 2024
4900fcc
enhance(curriculum): use grey border on module hover
caugner May 3, 2024
3806ea0
enhance(curriculum): update notes background-color in dark theme
caugner May 3, 2024
b45e534
enhance(curriculum): use same padding around notes
caugner May 3, 2024
52dee7c
enhance(curriculum): adjust ul/ol/p spacing in notes
caugner May 3, 2024
8b3b042
enhance(curricullum): reduce margin below list
caugner May 3, 2024
1de0420
chore(curriculum): update background color
caugner May 3, 2024
078aa13
chore(curriculum): use bg color from label bg
caugner May 3, 2024
bd4d85f
chore(curriculum): sync notes hue with bg-color
caugner May 3, 2024
27c209d
Merge branch 'main' into curriculum-design-nits
caugner Jun 14, 2024
9f53c0f
fixup! chore(curriculum): use bg color from label bg
caugner Jun 14, 2024
e27232e
fix(curriculum): revert --curiculum-bg-color in light theme
caugner Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions client/src/curriculum/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,27 @@
border: 0;
border-radius: var(--elem-radius);
margin: 1rem;
padding: 0.5rem 2rem;
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;
Expand All @@ -251,7 +271,7 @@

ol,
ul {
margin: 1rem 0 2rem;
margin: 1rem 0;
padding-left: 2rem;

ol,
Expand Down
1 change: 1 addition & 0 deletions client/src/curriculum/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@

p.curriculum-resources {
margin-bottom: 0.5rem;
margin-top: 2rem;

+ ul {
padding-left: 2rem;
Expand Down
8 changes: 4 additions & 4 deletions client/src/ui/base/_themes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -493,8 +493,8 @@
--curriculum-color-topic-scripting: #f2cf8f;
--curriculum-color-topic-tooling: #8ff2a4;
--curriculum-color-topic-practices: #c891f2;
--curriculum-bg-color: #664b33;
--curriculum-bg-color-note: #321d13;
--curriculum-bg-color: #321d13;
--curriculum-bg-color-note: #332c29;
--curriculum-bg-large-color: #343434;
--curriculum-bg-color-topic-standards: #994b53;
--curriculum-bg-color-topic-styling: #4e609e;
Expand All @@ -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;
Expand Down
Loading