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

Jump to bottom

web: more precise typography letter-spacing #20692

Merged
merged 2 commits into from May 6, 2021
Merged

web: more precise typography letter-spacing #20692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd6d5f7
web: more precise typography letter-spacing
valerybugakov May 6, 2021
2871df5
web: revert redudant change
valerybugakov May 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions client/branded/src/global-styles/buttons-redesign.scss
View file
Open in desktop
Expand Up @@ -187,13 +187,18 @@
@extend %label-base;
}

.btn.btn-sm {
@extend %label-base-small;
}

// Label / Uppercase / Base
.btn.text-uppercase {
@extend %label-uppercase;

// Label / Uppercase / Small
&.btn-sm {
font-size: 0.6875rem;
@extend %label-uppercase;
}
}
}
Expand Down
35 changes: 23 additions & 12 deletions client/branded/src/global-styles/typography-redesign.scss
View file
Open in desktop
@@ -1,32 +1,32 @@
.theme-redesign {
h1 {
font-size: 1.625rem;
font-size: 1.625rem; // 26px
font-weight: 600;
letter-spacing: -0.031em;
letter-spacing: (0.5/26) + em;
}

h2 {
font-size: 1.25rem;
font-size: 1.25rem; // 20px
font-weight: 600;
letter-spacing: -0.016em;
letter-spacing: (0.25/20) + em;
}

h3 {
font-size: 1rem;
font-size: 1rem; // 16px
font-weight: 600;
letter-spacing: -0.016em;
letter-spacing: (0.25/16) + em;
}

h4 {
font-size: 0.875rem;
font-size: 0.875rem; // 14px
font-weight: 500;
letter-spacing: -0.016em;
letter-spacing: (0.25/14) + em;
}

h5 {
font-size: 0.625rem;
font-size: 0.625rem; // 10px
font-weight: 600;
letter-spacing: 0.031em;
letter-spacing: (0.5/10) + em;
text-transform: uppercase;
}

Expand Down Expand Up @@ -67,13 +67,24 @@
label,
%label-base {
font-weight: 500;
letter-spacing: -0.016em;
letter-spacing: -(0.1/14) + em;
}

label small,
%label-base-small {
letter-spacing: -(0.25/12) + em;
}

// Label / Uppercase
label.text-uppercase,
%label-uppercase {
font-size: 0.75rem;
letter-spacing: 0.016em;
letter-spacing: (0.25/14) + em;
}

label.text-uppercase small,
%label-uppercase-small {
font-size: 0.75rem;
letter-spacing: -(0.25/12) + em;
}
}