Skip to content

Commit df9bf5e

Browse files
author
Felix Hennig
committed
Move fonts from typeface to fontsource
1 parent 58df7c1 commit df9bf5e

10 files changed

+87
-81
lines changed

gulp.d/tasks/build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ module.exports = (src, dest, preview) => () => {
3737
}),
3838
postcssUrl([
3939
{
40-
filter: '**/~typeface-*/files/*',
40+
filter: '**/~@fontsource/*/files/*',
4141
url: (asset) => {
4242
const relpath = asset.pathname.substr(1)
4343
const abspath = require.resolve(relpath)

package-lock.json

Lines changed: 21 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
"devDependencies": {
2222
"@asciidoctor/core": "~2.2",
2323
"@asciidoctor/tabs": "^1.0.0-beta.6",
24+
"@fontsource/ibm-plex-mono": "^5.0.14",
25+
"@fontsource/noto-sans": "^5.0.22",
26+
"@fontsource/roboto-mono": "^5.0.19",
2427
"autoprefixer": "^10.4",
2528
"browser-pack-flat": "^3.4",
2629
"browserify": "^17.0",
@@ -60,9 +63,5 @@
6063
"typeface-roboto-mono": "1.1.13",
6164
"vinyl-buffer": "^1.0",
6265
"vinyl-fs": "^3.0"
63-
},
64-
"dependencies": {
65-
"typeface-ibm-plex-mono": "^1.1.13",
66-
"typeface-noto-sans": "^1.1.13"
6766
}
6867
}

src/css/fontsource-ibm-plex-mono.css

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
@font-face {
2+
font-family: "IBM Plex Mono";
3+
font-style: normal;
4+
font-weight: 400;
5+
src:
6+
url(~@fontsource/ibm-plex-mono/files/ibm-plex-mono-latin-400-normal.woff2) format("woff2"),
7+
url(~@fontsource/ibm-plex-mono/files/ibm-plex-mono-latin-400-normal.woff) format("woff");
8+
}
9+
10+
@font-face {
11+
font-family: "IBM Plex Mono";
12+
font-style: normal;
13+
font-weight: 600;
14+
src:
15+
url(~@fontsource/ibm-plex-mono/files/ibm-plex-mono-latin-600-normal.woff2) format("woff2"),
16+
url(~@fontsource/ibm-plex-mono/files/ibm-plex-mono-latin-600-normal.woff) format("woff");
17+
}

src/css/fontsource-noto-sans.css

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
@font-face {
2+
font-family: "Noto Sans";
3+
font-style: normal;
4+
font-weight: 400;
5+
src:
6+
local("Roboto Mono Regular"),
7+
local("RobotoMono-Regular"),
8+
url(~@fontsource/noto-sans/files/noto-sans-latin-400-normal.woff2) format("woff2"),
9+
url(~@fontsource/noto-sans/files/noto-sans-latin-400-normal.woff) format("woff");
10+
}
11+
12+
@font-face {
13+
font-family: "Noto Sans";
14+
font-style: normal;
15+
font-weight: 700;
16+
src:
17+
local("Roboto Mono Medium"),
18+
local("RobotoMono-Medium"),
19+
url(~@fontsource/noto-sans/files/noto-sans-latin-700-normal.woff2) format("woff2"),
20+
url(~@fontsource/noto-sans/files/noto-sans-latin-700-normal.woff) format("woff");
21+
}

src/css/fontsource-roboto-mono.css

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
@font-face {
2+
font-family: "Roboto Mono";
3+
font-style: normal;
4+
font-weight: 400;
5+
src:
6+
local("Roboto Mono Regular"),
7+
local("RobotoMono-Regular"),
8+
url(~@fontsource/roboto-mono/files/roboto-mono-latin-400-normal.woff2) format("woff2"),
9+
url(~@fontsource/roboto-mono/files/roboto-mono-latin-400-normal.woff) format("woff");
10+
}
11+
12+
@font-face {
13+
font-family: "Roboto Mono";
14+
font-style: normal;
15+
font-weight: 500;
16+
src:
17+
local("Roboto Mono Medium"),
18+
local("RobotoMono-Medium"),
19+
url(~@fontsource/roboto-mono/files/roboto-mono-latin-500-normal.woff2) format("woff2"),
20+
url(~@fontsource/roboto-mono/files/roboto-mono-latin-500-normal.woff) format("woff");
21+
}

src/css/site.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
@import "typeface-noto-sans.css";
3-
@import "typeface-ibm-plex-mono.css";
4-
@import "typeface-roboto-mono.css";
2+
@import "fontsource-noto-sans.css";
3+
@import "fontsource-ibm-plex-mono.css";
4+
@import "fontsource-roboto-mono.css";
55
@import "vars.css";
66
@import "base.css";
77
@import "body.css";

src/css/typeface-ibm-plex-mono.css

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/css/typeface-noto-sans.css

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/css/typeface-roboto-mono.css

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)