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

feat: Update spacing in Ordered and Unordered List #1632

Merged
merged 7 commits into from
Oct 9, 2024
Merged

feat: Update spacing in Ordered and Unordered List #1632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
275e8ac
Added xs padding on top of sublist
dlnr Oct 7, 2024
83e35a1
Update proprietary/tokens/src/components/ams/ordered-list.tokens.json
dlnr Oct 9, 2024
0b877f0
Update proprietary/tokens/src/components/ams/unordered-list.tokens.json
dlnr Oct 9, 2024
0d20594
Increase whitespace between level 1 list items
VincentSmedinga Oct 9, 2024
72d8231
Add bottom padding token for reuse
VincentSmedinga Oct 9, 2024
74c2300
Merge branch 'develop' into feature/DES-965-sub-list-gap
VincentSmedinga Oct 9, 2024
1c65b26
Remove comments
VincentSmedinga Oct 9, 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
8 changes: 3 additions & 5 deletions packages/css/src/components/ordered-list/ordered-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@

@import "../../common/text-rendering";

/** Apply border box sizing, reset white space and list styles. */
@mixin reset {
box-sizing: border-box;
list-style-type: none;
margin-block: 0;
padding-inline-start: 0;
}

/** A list is a grid column with a gap between items. */
.ams-ordered-list {
display: grid;
gap: var(--ams-ordered-list-gap);
Expand All @@ -22,7 +20,6 @@
@include reset;
}

/** A list with markers sets typography for its text content. */
.ams-ordered-list:not(.ams-ordered-list--no-markers) {
color: var(--ams-ordered-list-color);
font-family: var(--ams-ordered-list-font-family);
Expand All @@ -31,7 +28,6 @@
line-height: var(--ams-ordered-list-line-height);
list-style-type: var(--ams-ordered-list-list-style-type);

/** List items are responsible for indentation and marker positioning. */
.ams-ordered-list__item {
margin-inline-start: var(--ams-ordered-list-item-margin-inline-start);
padding-inline-start: var(--ams-ordered-list-item-padding-inline-start);
Expand All @@ -47,9 +43,11 @@
line-height: var(--ams-ordered-list-small-line-height);
}

/** A nested list has a different marker and less indentation for correct alignment. */
:is(.ams-ordered-list, .ams-unordered-list) .ams-ordered-list {
gap: var(--ams-ordered-list-ordered-list-gap);
list-style-type: var(--ams-ordered-list-ordered-list-list-style-type);
padding-block-end: var(--ams-ordered-list-ordered-list-padding-block-end);
padding-block-start: var(--ams-ordered-list-ordered-list-padding-block-start);

.ams-ordered-list__item {
margin-inline-start: var(--ams-ordered-list-ordered-list-item-margin-inline-start);
Expand Down
8 changes: 3 additions & 5 deletions packages/css/src/components/unordered-list/unordered-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@

@import "../../common/text-rendering";

/** Apply border box sizing, reset white space and list styles. */
@mixin reset {
box-sizing: border-box;
list-style: none;
margin-block: 0;
padding-inline-start: 0;
}

/** A list is a grid column with a gap between items. */
.ams-unordered-list {
display: grid;
gap: var(--ams-unordered-list-gap);
Expand All @@ -22,7 +20,6 @@
@include reset;
}

/** A list with markers sets typography for its text content. */
.ams-unordered-list:not(.ams-unordered-list--no-markers) {
color: var(--ams-unordered-list-color);
font-family: var(--ams-unordered-list-font-family);
Expand All @@ -31,7 +28,6 @@
line-height: var(--ams-unordered-list-line-height);
list-style-type: var(--ams-unordered-list-list-style-type);

/** List items are responsible for indentation and marker positioning. */
.ams-unordered-list__item {
margin-inline-start: var(--ams-unordered-list-item-margin-inline-start);
padding-inline-start: var(--ams-unordered-list-item-padding-inline-start);
Expand All @@ -47,9 +43,11 @@
line-height: var(--ams-unordered-list-small-line-height);
}

/** A nested list has a different marker and less indentation for correct alignment. */
:is(.ams-ordered-list, .ams-unordered-list) .ams-unordered-list {
gap: var(--ams-unordered-list-unordered-list-gap);
list-style-type: var(--ams-unordered-list-unordered-list-list-style-type);
padding-block-end: var(--ams-unordered-list-unordered-list-padding-block-end);
padding-block-start: var(--ams-unordered-list-unordered-list-padding-block-start);

.ams-unordered-list__item {
margin-inline-start: var(--ams-unordered-list-unordered-list-item-margin-inline-start);
Expand Down
5 changes: 4 additions & 1 deletion proprietary/tokens/src/components/ams/ordered-list.tokens.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"font-family": { "value": "{ams.text.font-family}" },
"font-size": { "value": "{ams.text.level.5.font-size}" },
"font-weight": { "value": "{ams.text.font-weight.normal}" },
"gap": { "value": "{ams.space.sm}" },
"gap": { "value": "{ams.space.md}" },
"inverse-color": { "value": "{ams.color.primary-white}" },
"line-height": { "value": "{ams.text.level.5.line-height}" },
"list-style-type": { "value": "decimal" },
Expand All @@ -24,7 +24,10 @@
}
},
"ordered-list": {
"gap": { "value": "{ams.space.sm}" },
"list-style-type": { "value": "lower-alpha" },
"padding-block-end": { "value": "0" },
"padding-block-start": { "value": "{ams.space.sm}" },
"item": {
"margin-inline-start": {
"value": "1.5rem",
Expand Down
5 changes: 4 additions & 1 deletion proprietary/tokens/src/components/ams/unordered-list.tokens.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"font-family": { "value": "{ams.text.font-family}" },
"font-size": { "value": "{ams.text.level.5.font-size}" },
"font-weight": { "value": "{ams.text.font-weight.normal}" },
"gap": { "value": "{ams.space.sm}" },
"gap": { "value": "{ams.space.md}" },
"inverse-color": { "value": "{ams.color.primary-white}" },
"line-height": { "value": "{ams.text.level.5.line-height}" },
"list-style-type": { "value": "'\\2022'" },
Expand All @@ -20,7 +20,10 @@
}
},
"unordered-list": {
"gap": { "value": "{ams.space.sm}" },
"list-style-type": { "value": "'\\2013'" },
"padding-block-end": { "value": "0" },
"padding-block-start": { "value": "{ams.space.sm}" },
"item": {
"margin-inline-start": {
"value": "0.875rem",
Expand Down