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

Begin applying use-case tokens to o3 components. #1925

Merged
merged 4 commits into from
Jan 15, 2025
Merged

Begin applying use-case tokens to o3 components. #1925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24491f5
chore: Correct headline tokens
notlee Jan 14, 2025
9c7aec2
chore: Correct remaining heading tokens
notlee Jan 14, 2025
d08e6e6
chore: Correct tokens for editorial quotes
notlee Jan 14, 2025
97a9bb9
chore: Remove use of an undefined token
notlee Jan 15, 2025
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
38 changes: 14 additions & 24 deletions components/o3-editorial-typography/details.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ a.o3-editorial-typography-byline-author[data-o3-theme='inverse'] {
content: '';
width: var(--_o3-editorial-typography-quote-icon-size);
height: var(--_o3-editorial-typography-quote-icon-size);
mask-image: var(--o3-icon-speech-left);
mask-image: var(--o3-icon-quote-left);
mask-repeat: no-repeat;
mask-size: contain;
display: inline-block;
Expand Down Expand Up @@ -160,36 +160,26 @@ a.o3-editorial-typography-byline-author[data-o3-theme='inverse'] {
}

.o3-editorial-typography-pullquote__author {
font-family: var(--o3-typography-use-case-body-small-bold-font-family),
font-family: var(--o3-typography-use-case-body-base-highlight-font-family),
sans-serif;
font-size: var(--o3-typography-use-case-body-small-bold-font-size);
font-weight: var(--o3-typography-use-case-body-small-bold-font-weight);
line-height: var(--o3-typography-use-case-body-small-bold-line-height);
}

.o3-editorial-typography-pullquote__source {
font-family: var(--_o3-editorial-typography-pullquote-source-font-family),
sans-serif;
font-size: var(--_o3-editorial-typography-pullquote-source-font-size);
font-weight: var(--_o3-editorial-typography-pullquote-source-font-weight);
line-height: var(--_o3-editorial-typography-pullquote-source-line-height);
font-size: var(--o3-typography-use-case-body-base-highlight-font-size);
font-weight: var(--o3-typography-use-case-body-base-highlight-font-weight);
line-height: var(--o3-typography-use-case-body-base-highlight-line-height);
}

.o3-editorial-typography-blockquote__author {
font-family: var(--o3-typography-use-case-body-small-bold-font-family),
sans-serif;
font-size: var(--o3-typography-use-case-body-small-bold-font-size);
font-weight: var(--o3-typography-use-case-body-small-bold-font-weight);
line-height: var(--o3-typography-use-case-body-small-bold-line-height);
text-transform: uppercase;
font-family: var(--o3-typography-use-case-label-font-family), sans-serif;
font-size: var(--o3-typography-use-case-label-font-size);
font-weight: var(--o3-typography-use-case-label-font-weight);
line-height: var(--o3-typography-use-case-label-line-height);
text-transform: var(--o3-typography-use-case-label-text-case);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This token is undefined, is this expected?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good spot, I think you mean --o3-typography-use-case-detail-text-case? I've removed that

}

.o3-editorial-typography-blockquote__source {
font-family: var(--o3-typography-use-case-body-standard-font-family),
sans-serif;
font-size: var(--o3-typography-use-case-body-standard-font-size);
font-weight: var(--o3-typography-use-case-body-standard-font-weight);
line-height: var(--o3-typography-use-case-body-standard-line-height);
font-family: var(--o3-typography-use-case-detail-font-family), sans-serif;
font-size: var(--o3-typography-use-case-detail-font-size);
font-weight: var(--o3-typography-use-case-detail-font-weight);
line-height: var(--o3-typography-use-case-detail-line-height);
}

.o3-editorial-typography-big-number,
Expand Down
47 changes: 24 additions & 23 deletions components/o3-editorial-typography/heading.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.o3-editorial-typography-headline {
font-family: var(--_o3-editorial-typography-headline-s-font-family), serif;
font-size: var(--_o3-editorial-typography-headline-s-font-size);
font-weight: var(--_o3-editorial-typography-headline-s-font-weight);
line-height: var(--_o3-editorial-typography-headline-s-line-height);
font-family: var(--o3-typography-use-case-headline-sm-font-family), serif;
font-size: var(--o3-typography-use-case-headline-sm-font-size);
font-weight: var(--o3-typography-use-case-headline-sm-font-weight);
line-height: var(--o3-typography-use-case-headline-sm-line-height);
}

.o3-editorial-typography-display {
Expand All @@ -22,30 +22,31 @@
}

.o3-editorial-typography-chapter {
font-family: var(--_o3-editorial-typography-chapter-font-family), sans-serif;
font-size: var(--_o3-editorial-typography-chapter-font-size);
font-weight: var(--_o3-editorial-typography-chapter-font-weight);
line-height: var(--_o3-editorial-typography-chapter-line-height);
font-family: var(--o3-typography-use-case-title-lg-font-family), sans-serif;
font-size: var(--o3-typography-use-case-title-lg-font-size);
font-weight: var(--o3-typography-use-case-title-lg-font-weight);
line-height: var(--o3-typography-use-case-title-lg-line-height);
}

.o3-editorial-typography-subheading {
font-family: var(--_o3-editorial-typography-subheading-font-family),
sans-serif;
font-size: var(--_o3-editorial-typography-subheading-font-size);
font-weight: var(--_o3-editorial-typography-subheading-font-weight);
line-height: var(--_o3-editorial-typography-subheading-line-height);
font-family: var(--o3-typography-use-case-title-md-font-family), sans-serif;
font-size: var(--o3-typography-use-case-title-md-font-size);
font-weight: var(--o3-typography-use-case-title-md-font-weight);
line-height: var(--o3-typography-use-case-title-md-line-height);
}

.o3-editorial-typography-label {
font-family: var(--_o3-editorial-typography-label-font-family), sans-serif;
font-size: var(--_o3-editorial-typography-label-font-size);
font-weight: var(--_o3-editorial-typography-label-font-weight);
line-height: var(--_o3-editorial-typography-label-line-height);
font-family: var(--o3-typography-use-case-body-base-font-family), sans-serif;
font-size: var(--o3-typography-use-case-body-base-font-size);
font-weight: var(--o3-typography-use-case-body-base-font-weight);
line-height: var(--o3-typography-use-case-body-base-line-height);
}

@media (min-width: 740px) {
.o3-editorial-typography-headline {
font-size: var(--_o3-editorial-typography-headline-m-font-size);
font-weight: var(--_o3-editorial-typography-headline-m-font-weight);
line-height: var(--_o3-editorial-typography-headline-m-line-height);
font-size: var(--o3-typography-use-case-headline-md-font-size);
font-weight: var(--o3-typography-use-case-headline-md-font-weight);
line-height: var(--o3-typography-use-case-headline-md-line-height);
}

.o3-editorial-typography-display {
Expand All @@ -57,9 +58,9 @@

@media (min-width: 980px) {
.o3-editorial-typography-headline {
font-size: var(--_o3-editorial-typography-headline-l-font-size);
font-weight: var(--_o3-editorial-typography-headline-l-font-weight);
line-height: var(--_o3-editorial-typography-headline-l-line-height);
font-size: var(--o3-typography-use-case-headline-lg-font-size);
font-weight: var(--o3-typography-use-case-headline-lg-font-weight);
line-height: var(--o3-typography-use-case-headline-lg-line-height);
}

.o3-editorial-typography-display {
Expand Down
2 changes: 1 addition & 1 deletion components/o3-editorial-typography/stories/story-templates.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const HeadingTemplate: StoryObj = {
argTypes: {
...TemplateSBConfig.argTypes,
type: {
options: ['display', 'Heading', 'subheading', 'chapter', 'label'],
options: ['display', 'headline', 'subheading', 'chapter', 'label'],
control: {
type: 'radio',
},
Expand Down
Loading