Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/components/text/_subheadlines.scss
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ $subheadlineSizeRules: (

.sg-subheadline {
@include subheadlineTypeSizeVariant(medium);
font-family: $fontFamilyUntitledSerif;
font-family: $fontFamilyPrimary;
font-feature-settings: $fontFeatureSettings;
display: block;
color: $black;
font-weight: $fontWeightNormal;
Expand Down
4 changes: 2 additions & 2 deletions src/components/text/stories/text.stories.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ export const HeadlineExamples = extraBold => {

## Subheadlines

Subheadlines is reserved for marketing use only. Do not apply it on product pages and in the mobile application.
Subheadlines are reserved for marketing use only. Do not apply it on product pages and in the mobile application.

We assumed that a ratio between line height and font size of subheadlines will be always constant and close as much as possible to a value of 1.125. This will provide us with the same proportions of text for each level on the scale.

Expand Down Expand Up @@ -237,7 +237,7 @@ export const SubheadlineExamples = () => {
return sizeVariant;
};

**Font**: Untitled Serif
**Font**: Figtree
**Weight**: 400

<Typeset>{SubheadlineExamples()}</Typeset>
Expand Down
1 change: 0 additions & 1 deletion src/css/config/fontFamily.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module.exports = {
sans: ['Figtree', 'Helvetica', 'Arial', 'sans-serif'],
serif: ['UntitledSerif', 'serif'],
mono: [
'ui-monospace',
'SFMono-Regular',
Expand Down
1 change: 0 additions & 1 deletion src/sass/_config.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ $shadowLarge: 0 8px 32px 0 rgba($gray-70, 0.2);

// Fonts
$fontFamilyFigtree: 'Figtree';
$fontFamilyUntitledSerif: 'UntitledSerif';
$fontFamilyPrimary: $fontFamilyFigtree, 'Helvetica', 'Arial', sans-serif;
$fontFeatureSettings: 'ss01' 1; /* enables single-storey 'a' */
$fontWeightNormal: 400;
Expand Down
11 changes: 0 additions & 11 deletions src/sass/_fonts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ $figtreeBoldWoff2Path: $sgFontsPath + 'Figtree-Bold.woff2';
$figtreeBoldWoffPath: $sgFontsPath + 'Figtree-Bold.woff';
$figtreeBlackWoff2Path: $sgFontsPath + 'Figtree-Black.woff2';
$figtreeBlackWoffPath: $sgFontsPath + 'Figtree-Black.woff';
$untitledSerifRegularWoff2Path: $sgFontsPath + 'UntitledSerif-Regular.woff2';
$untitledSerifRegularWoffPath: $sgFontsPath + 'UntitledSerif-Regular.woff';

@if ($includeHtml and $includeFonts) {
@font-face {
Expand Down Expand Up @@ -36,13 +34,4 @@ $untitledSerifRegularWoffPath: $sgFontsPath + 'UntitledSerif-Regular.woff';
font-style: normal;
font-display: swap;
}

@font-face {
font-family: $fontFamilyUntitledSerif;
src: url($untitledSerifRegularWoff2Path) format('woff2'),
url($untitledSerifRegularWoffPath) format('woff');
font-weight: $fontWeightNormal;
font-style: normal;
font-display: swap;
}
}