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

use Inter font #1062

Merged
merged 4 commits into from
Nov 16, 2023
Merged

use Inter font #1062

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff964e1
use Inter font
jasonbasuil Nov 10, 2023
cbcf7fa
update Typography stories
jasonbasuil Nov 15, 2023
080ce65
use synth namespace for variables
jasonbasuil Nov 15, 2023
b6818ac
support old font-types
jasonbasuil Nov 16, 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
4 changes: 2 additions & 2 deletions scss/baseline.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@import './typography';

body {
font-family: $font-family;
font-size: $font-size-base;
font-family: $synth-font-family;
font-size: $synth-font-size-base;
color: $ux-gray-900;
}
8 changes: 4 additions & 4 deletions scss/forms/form_control_label.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
@import '../typography';

.FormControlLabel {
@include font-type-30;
@include synth-font-type-30;
align-items: center;
color: $ux-gray-900;
display: flex;
margin-bottom: 0.5rem;

&--with-children {
@include font-type-30--medium;
@include synth-font-type-30--medium;

align-items: flex-start;
flex-direction: column;
Expand All @@ -24,7 +24,7 @@
}

&__helper-text {
@include font-type-30--medium;
@include synth-font-type-30--medium;
font-weight: 100;
}

Expand All @@ -34,7 +34,7 @@
}

&__children {
@include font-type-30--medium;
@include synth-font-type-30--medium;

font-weight: 100;
margin-top: 0.5rem;
Expand Down
12 changes: 6 additions & 6 deletions scss/forms/form_group.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
padding: 1rem;

.InputLabel {
@include font-type-30--bold;
@include synth-font-type-30--bold;
margin-bottom: 0.5rem;

&__helper-text {
@include font-type-30;
@include synth-font-type-30;
font-weight: 100;
color: $ux-gray-900;
}
Expand Down Expand Up @@ -57,7 +57,7 @@
}

&__helper-text {
@include font-type-20--medium;
@include synth-font-type-20--medium;
font-weight: 100;
color: $ux-gray-900;
padding: .375rem 0;
Expand All @@ -69,7 +69,7 @@
}

&__invalid-feedback {
@include font-type-20--medium;
@include synth-font-type-20--medium;
color: $ux-red;
padding: .375rem 0;
margin: 0;
Expand All @@ -80,12 +80,12 @@
}

.form-control {
@include font-type-30;
@include synth-font-type-30;
height: 2.25rem;
}

textarea.form-control {
@include font-type-30;
@include synth-font-type-30;
height: auto;
}

Expand Down
4 changes: 2 additions & 2 deletions scss/forms/input_label.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
@import '../typography';

.InputLabel, .InputLegend {
@include font-type-30--bold;
@include synth-font-type-30--bold;
display: flex;
flex-wrap: wrap;
margin-bottom: 0.375rem;

&__helper-text {
@include font-type-30--medium;
@include synth-font-type-30--medium;
font-weight: 100;
color: $ux-gray-900;
}
Expand Down
2 changes: 1 addition & 1 deletion scss/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import url('https://fonts.googleapis.com/css2?family=DM+Sans:wght@400;500;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;700&display=swap');
@import './theme';
@import './baseline';
140 changes: 70 additions & 70 deletions scss/typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,135 +1,135 @@
$font-family: DM Sans, sans-serif;
$font-weight-regular: 400;
$font-weight-medium: 500;
$font-weight-bold: 700;
$font-size-base: 0.875rem;
$synth-font-family: Inter, sans-serif;
$synth-font-weight-regular: 400;
$synth-font-weight-medium: 500;
$synth-font-weight-bold: 700;
$synth-font-size-base: 0.875rem;

@mixin font-type-10() {
@mixin synth-font-type-10() {
font-size: .625rem;
font-weight: $font-weight-regular;
font-weight: $synth-font-weight-regular;
letter-spacing: 0.0625rem;
line-height: 0.875rem;
}

@mixin font-type-20() {
@mixin synth-font-type-20() {
font-size: .75rem;
font-weight: $font-weight-regular;
font-weight: $synth-font-weight-regular;
line-height: 1rem;
}

@mixin font-type-30() {
font-size: $font-size-base;
font-weight: $font-weight-regular;
@mixin synth-font-type-30() {
font-size: $synth-font-size-base;
font-weight: $synth-font-weight-regular;
line-height: 1.25rem;
}

@mixin font-type-40() {
@mixin synth-font-type-40() {
font-size: 1rem;
font-weight: $font-weight-regular;
font-weight: $synth-font-weight-regular;
line-height: 1.375rem;
}

@mixin font-type-50() {
@mixin synth-font-type-50() {
font-size: 1.125rem;
font-weight: $font-weight-regular;
font-weight: $synth-font-weight-regular;
line-height: 1.5rem;
}

@mixin font-type-60() {
@mixin synth-font-type-60() {
font-size: 1.25rem;
font-weight: $font-weight-regular;
font-weight: $synth-font-weight-regular;
line-height: 1.625rem;
}

@mixin font-type-70() {
@mixin synth-font-type-70() {
font-size: 1.5rem;
font-weight: $font-weight-regular;
font-weight: $synth-font-weight-regular;
line-height: 2rem;
}

@mixin font-type-10--medium() {
@include font-type-10;
font-weight: $font-weight-medium;
@mixin synth-font-type-10--medium() {
@include synth-font-type-10;
font-weight: $synth-font-weight-medium;
}

@mixin font-type-20--medium() {
@include font-type-20;
font-weight: $font-weight-medium;
@mixin synth-font-type-20--medium() {
@include synth-font-type-20;
font-weight: $synth-font-weight-medium;
}

@mixin font-type-30--medium() {
@include font-type-30;
font-weight: $font-weight-medium;
@mixin synth-font-type-30--medium() {
@include synth-font-type-30;
font-weight: $synth-font-weight-medium;
}

@mixin font-type-40--medium() {
@include font-type-40();
font-weight: $font-weight-medium;
@mixin synth-font-type-40--medium() {
@include synth-font-type-40();
font-weight: $synth-font-weight-medium;
}

@mixin font-type-50--medium() {
@include font-type-50;
font-weight: $font-weight-medium;
@mixin synth-font-type-50--medium() {
@include synth-font-type-50;
font-weight: $synth-font-weight-medium;
}

@mixin font-type-60--medium() {
@include font-type-60();
font-weight: $font-weight-medium;
@mixin synth-font-type-60--medium() {
@include synth-font-type-60();
font-weight: $synth-font-weight-medium;
}

@mixin font-type-70--medium() {
@include font-type-70;
font-weight: $font-weight-medium;
@mixin synth-font-type-70--medium() {
@include synth-font-type-70;
font-weight: $synth-font-weight-medium;
}

@mixin font-type-10--bold() {
@include font-type-10;
font-weight: $font-weight-bold;
@mixin synth-font-type-10--bold() {
@include synth-font-type-10;
font-weight: $synth-font-weight-bold;
}

@mixin font-type-20--bold() {
@include font-type-20;
font-weight: $font-weight-bold;
@mixin synth-font-type-20--bold() {
@include synth-font-type-20;
font-weight: $synth-font-weight-bold;
}

@mixin font-type-30--bold() {
@include font-type-30;
font-weight: $font-weight-bold;
@mixin synth-font-type-30--bold() {
@include synth-font-type-30;
font-weight: $synth-font-weight-bold;
}

@mixin font-type-40--bold() {
@include font-type-40;
font-weight: $font-weight-bold;
@mixin synth-font-type-40--bold() {
@include synth-font-type-40;
font-weight: $synth-font-weight-bold;
}

@mixin font-type-50--bold() {
@include font-type-50;
font-weight: $font-weight-bold;
@mixin synth-font-type-50--bold() {
@include synth-font-type-50;
font-weight: $synth-font-weight-bold;
}

@mixin font-type-60--bold() {
@include font-type-60;
font-weight: $font-weight-bold;
@mixin synth-font-type-60--bold() {
@include synth-font-type-60;
font-weight: $synth-font-weight-bold;
}

@mixin font-type-70--bold() {
@include font-type-70;
font-weight: $font-weight-bold;
@mixin synth-font-type-70--bold() {
@include synth-font-type-70;
font-weight: $synth-font-weight-bold;
}

// Uppercase fonts

@mixin font-type-10--uppercase() {
@include font-type-10;
@mixin synth-font-type-10--uppercase() {
@include synth-font-type-10;
text-transform: uppercase;
}

@mixin font-type-10--bold-uppercase() {
@include font-type-10--uppercase;
font-weight: $font-weight-bold;
@mixin synth-font-type-10--bold-uppercase() {
@include synth-font-type-10--uppercase;
font-weight: $synth-font-weight-bold;
}

@mixin font-type-10--medium-uppercase() {
@include font-type-10--uppercase;
font-weight: $font-weight-medium
@mixin synth-font-type-10--medium-uppercase() {
@include synth-font-type-10--uppercase;
font-weight: $synth-font-weight-medium
}
Loading
Loading