Skip to content

Update Text component styles #9353

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

Merged
merged 4 commits into from
Jun 2, 2023
Merged

Update Text component styles #9353

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aba1cb7
Update Text component styles
aaronccasanova Jun 1, 2023
471b9a9
Merge branch 'v11.x.x' of https://github.com/Shopify/polaris into upd…
aaronccasanova Jun 1, 2023
ad9fedf
Fix overrides after Storybook tophat
aaronccasanova Jun 1, 2023
b6f1927
Update polaris-react/src/components/Text/Text.scss
aaronccasanova Jun 1, 2023
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
70 changes: 70 additions & 0 deletions polaris-react/src/components/Text/Text.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,32 +56,58 @@
color: var(--p-color-text-inverse);
}

@mixin se23-headingSm {
font-size: var(--p-font-size-80-experimental);
line-height: var(--p-font-line-height-2);
}

.headingXs {
font-size: var(--p-font-size-75);
line-height: var(--p-font-line-height-1);
font-weight: var(--p-font-weight-semibold);

#{$se23} & {
@include se23-headingSm;
}
}

.headingSm {
font-size: var(--p-font-size-100);
line-height: var(--p-font-line-height-2);
font-weight: var(--p-font-weight-semibold);

#{$se23} & {
@include se23-headingSm;
}
}

.headingMd {
font-size: var(--p-font-size-200);
line-height: var(--p-font-line-height-3);
font-weight: var(--p-font-weight-semibold);

#{$se23} & {
font-size: var(--p-font-size-100);
line-height: var(--p-font-line-height-2);
}
}

.headingLg {
font-size: var(--p-font-size-200);
line-height: var(--p-font-line-height-2);
font-weight: var(--p-font-weight-semibold);

#{$se23} & {
font-size: var(--p-font-size-300);
line-height: var(--p-font-line-height-3);
font-weight: var(--p-font-weight-bold);
}

@media #{$p-breakpoints-md-up} {
font-size: var(--p-font-size-300);
line-height: var(--p-font-line-height-3);

// TODO: Add beta flagged responsive styles
}
}

Expand All @@ -90,9 +116,17 @@
line-height: var(--p-font-line-height-3);
font-weight: var(--p-font-weight-semibold);

#{$se23} & {
font-size: var(--p-font-size-400);
line-height: var(--p-font-line-height-5);
font-weight: var(--p-font-weight-bold);
}

@media #{$p-breakpoints-md-up} {
font-size: var(--p-font-size-400);
line-height: var(--p-font-line-height-4);

// TODO: Add beta flagged responsive styles
}
}

Expand All @@ -101,20 +135,40 @@
line-height: var(--p-font-line-height-3);
font-weight: var(--p-font-weight-semibold);

#{$se23} & {
font-size: var(--p-font-size-500);
line-height: var(--p-font-line-height-6);
font-weight: var(--p-font-weight-bold);
}

@media #{$p-breakpoints-md-up} {
font-size: var(--p-font-size-500);
line-height: var(--p-font-line-height-5);

// TODO: Add beta flagged responsive styles
}
}

@mixin se23-heading3xl {
font-size: var(--p-font-size-600);
line-height: var(--p-font-line-height-7);
font-weight: var(--p-font-weight-bold);
}

.heading3xl {
font-size: var(--p-font-size-400);
line-height: var(--p-font-line-height-4);
font-weight: var(--p-font-weight-semibold);

#{$se23} & {
@include se23-heading3xl;
}

@media #{$p-breakpoints-md-up} {
font-size: var(--p-font-size-600);
line-height: var(--p-font-line-height-6);

// TODO: Add beta flagged responsive styles
}
}

Expand All @@ -123,9 +177,15 @@
line-height: var(--p-font-line-height-6);
font-weight: var(--p-font-weight-bold);

#{$se23} & {
@include se23-heading3xl;
}

@media #{$p-breakpoints-md-up} {
font-size: var(--p-font-size-700);
line-height: var(--p-font-line-height-7);

// TODO: Add beta flagged responsive styles
}
}

Expand All @@ -137,11 +197,21 @@
.bodyMd {
font-size: var(--p-font-size-100);
line-height: var(--p-font-line-height-2);

#{$se23} & {
font-size: var(--p-font-size-80-experimental);
}
}

.bodyLg {
font-size: var(--p-font-size-200);
line-height: var(--p-font-line-height-2);
// TODO: Should weight be here (even if regular is the default)?

#{$se23} & {
font-size: var(--p-font-size-100);
line-height: var(--p-font-line-height-2);
}
}

// font-weight must be below variant styles so
Expand Down