Skip to content

Commit 74c5442

Browse files
authored
Merge pull request #1238 from primer/tobiasahlin/move-font-face-out-from-vars
Move marketing @font-face declarations from vars to type
2 parents 914f4ba + 13c49b6 commit 74c5442

File tree

2 files changed

+25
-26
lines changed

2 files changed

+25
-26
lines changed

src/marketing/support/variables.scss

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,5 @@
11
$marketing-font-path: "/fonts/" !default;
22

3-
// Type
4-
@font-face {
5-
font-family: Inter;
6-
font-style: normal;
7-
font-weight: $font-weight-normal;
8-
src: local("Inter"), local("Inter-Regular"), url("#{$marketing-font-path}Inter-Regular.woff") format("woff");
9-
font-display: swap;
10-
}
11-
12-
@font-face {
13-
font-family: Inter;
14-
font-style: normal;
15-
font-weight: $font-weight-semibold;
16-
src: local("Inter Medium"), local("Inter-Medium"), url("#{$marketing-font-path}Inter-Medium.woff") format("woff");
17-
font-display: swap;
18-
}
19-
20-
@font-face {
21-
font-family: Inter;
22-
font-style: normal;
23-
font-weight: $font-weight-bold;
24-
src: local("Inter Bold"), local("Inter-Bold"), url("#{$marketing-font-path}Inter-Bold.woff") format("woff");
25-
font-display: swap;
26-
}
27-
283
$font-mktg: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
294

305
// Builds upon @primer/css/support/variables/typography.scss

src/marketing/type/typography.scss

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
1-
// Headings
1+
// Type
2+
@font-face {
3+
font-family: Inter;
4+
font-style: normal;
5+
font-weight: $font-weight-normal;
6+
src: local("Inter"), local("Inter-Regular"), url("#{$marketing-font-path}Inter-Regular.woff") format("woff");
7+
font-display: swap;
8+
}
29

10+
@font-face {
11+
font-family: Inter;
12+
font-style: normal;
13+
font-weight: $font-weight-semibold;
14+
src: local("Inter Medium"), local("Inter-Medium"), url("#{$marketing-font-path}Inter-Medium.woff") format("woff");
15+
font-display: swap;
16+
}
17+
18+
@font-face {
19+
font-family: Inter;
20+
font-style: normal;
21+
font-weight: $font-weight-bold;
22+
src: local("Inter Bold"), local("Inter-Bold"), url("#{$marketing-font-path}Inter-Bold.woff") format("woff");
23+
font-display: swap;
24+
}
25+
26+
// Headings
327
.h000-mktg,
428
.h00-mktg,
529
.h0-mktg,

0 commit comments

Comments
 (0)