Skip to content

Commit 0f40022

Browse files
author
Thorn Walli
authored
Merge pull request #177 from GrabarzUndPartner/release
Release
2 parents 6e3f4e0 + 22ee667 commit 0f40022

20 files changed

+271
-109
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

example/nuxt.config.js

+20-2
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,31 @@ module.exports = {
112112
fontFaces: [
113113
{
114114
preload: true,
115-
src: '/fonts/roboto-slab-v11-latin/roboto-slab-v11-latin-regular',
115+
src: '/fonts/roboto-slab-v20-latin/roboto-slab-v20-latin-regular',
116116
fontWeight: 400,
117117
fontStyle: 'normal'
118118
},
119119
{
120120
preload: true,
121-
src: '/fonts/roboto-slab-v11-latin/roboto-slab-v11-latin-700',
121+
src: '/fonts/roboto-slab-v20-latin/roboto-slab-v20-latin-700',
122+
fontWeight: 700,
123+
fontStyle: 'normal'
124+
}
125+
]
126+
},
127+
{
128+
fileExtensions: ['ttf'],
129+
fontFamily: 'Roboto Mono',
130+
fontFaces: [
131+
{
132+
preload: true,
133+
src: '/fonts/roboto-mono/RobotoMono-Regular.ttf',
134+
fontWeight: 400,
135+
fontStyle: 'normal'
136+
},
137+
{
138+
preload: true,
139+
src: '/fonts/roboto-mono/RobotoMono-Bold.ttf',
122140
fontWeight: 700,
123141
fontStyle: 'normal'
124142
}

example/pages/index.vue

+32
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,20 @@
2727
Cum natus eveniet condimentum aliquid, repudiandae ultrices est, cumque fringilla? Repellendus deleniti non quidem a, recusandae harum in, nemo! Aut rhoncus alias risus sem? Facere fugiat, magni animi reiciendis interdum mauris purus, laboriosam fringilla. Corporis dolores dis provident aperiam ipsam. Vivamus tellus, temporibus a luctus, nesciunt, rutrum similique nostrum. Temporibus quisquam, rerum maecenas, diam, risus, volutpat, viverra proin accusamus maecenas, nibh justo animi, mauris proin? A congue debitis architecto? Varius aptent minus pellentesque rutrum, quas rutrum dis, scelerisque massa nunc anim sociis dignissimos libero, viverra, suspendisse vehicula, vulputate? Distinctio et. Condimentum atque fugit necessitatibus odit molestie sodales voluptatibus doloremque. Suscipit.
2828
</p>
2929
</section>
30+
31+
<section>
32+
<h2>Mono Normal</h2>
33+
<p class="mono-normal">
34+
Cum natus eveniet condimentum aliquid, repudiandae ultrices est, cumque fringilla? Repellendus deleniti non quidem a, recusandae harum in, nemo! Aut rhoncus alias risus sem? Facere fugiat, magni animi reiciendis interdum mauris purus, laboriosam fringilla. Corporis dolores dis provident aperiam ipsam. Vivamus tellus, temporibus a luctus, nesciunt, rutrum similique nostrum. Temporibus quisquam, rerum maecenas, diam, risus, volutpat, viverra proin accusamus maecenas, nibh justo animi, mauris proin? A congue debitis architecto? Varius aptent minus pellentesque rutrum, quas rutrum dis, scelerisque massa nunc anim sociis dignissimos libero, viverra, suspendisse vehicula, vulputate? Distinctio et. Condimentum atque fugit necessitatibus odit molestie sodales voluptatibus doloremque. Suscipit.
35+
</p>
36+
</section>
37+
38+
<section>
39+
<h2>Mono Bold</h2>
40+
<p class="mono-bold">
41+
Cum natus eveniet condimentum aliquid, repudiandae ultrices est, cumque fringilla? Repellendus deleniti non quidem a, recusandae harum in, nemo! Aut rhoncus alias risus sem? Facere fugiat, magni animi reiciendis interdum mauris purus, laboriosam fringilla. Corporis dolores dis provident aperiam ipsam. Vivamus tellus, temporibus a luctus, nesciunt, rutrum similique nostrum. Temporibus quisquam, rerum maecenas, diam, risus, volutpat, viverra proin accusamus maecenas, nibh justo animi, mauris proin? A congue debitis architecto? Varius aptent minus pellentesque rutrum, quas rutrum dis, scelerisque massa nunc anim sociis dignissimos libero, viverra, suspendisse vehicula, vulputate? Distinctio et. Condimentum atque fugit necessitatibus odit molestie sodales voluptatibus doloremque. Suscipit.
42+
</p>
43+
</section>
3044
<atom-github-corner />
3145
</article>
3246
</template>
@@ -150,6 +164,24 @@ body {
150164
font-family: 'Roboto', sans-serif;
151165
}
152166
}
167+
168+
&.mono-normal {
169+
font-family: monospace;
170+
font-weight: 400;
171+
172+
@nest .font_roboto_mono_400_normal & {
173+
font-family: 'Roboto Mono', monospace;
174+
}
175+
}
176+
177+
&.mono-bold {
178+
font-family: monospace;
179+
font-weight: 700;
180+
181+
@nest .font_roboto_mono_700_normal & {
182+
font-family: 'Roboto Mono', monospace;
183+
}
184+
}
153185
}
154186
}
155187
</style>

lib/utils/fontFace.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,15 @@ function getFileExtensions (font) {
8181
}
8282
}
8383
function getFormat (path) {
84-
return extname(path).replace(/^\./, '')
84+
const ext = extname(path).replace(/^\./, '')
85+
86+
switch (ext) {
87+
case 'ttf':
88+
return 'truetype'
89+
90+
default:
91+
return ext
92+
}
8593
}
8694

8795
function getProperties (face, transform = paramCase) {

0 commit comments

Comments
 (0)