Skip to content

Commit 55306c1

Browse files
committed
refactor: remove webfontloader
1 parent 5464238 commit 55306c1

File tree

11 files changed

+24
-133
lines changed

11 files changed

+24
-133
lines changed

assets/css/vars.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
$primary: #333436;
1+
$primary: #444549;
22
$accent: #384D66;
33
$containerWidth: 1440px;

components/ArticleList.vue

+13-26
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
<span v-html="shortTimestamp(article.date)"></span>
66
&nbsp;&nbsp;
77
<span class="topics">
8-
<nuxt-link
9-
class="topic fancy"
10-
v-for="topic in article._embedded['wp:term'][0]"
11-
:to="`/topics/${topic.slug}`"
12-
:key="topic.id"
13-
v-html="topic.name"
14-
></nuxt-link>
8+
<span class="topic" v-for="topic in article._embedded['wp:term'][0]">
9+
<nuxt-link
10+
class="fancy"
11+
:to="`/topics/${topic.slug}`"
12+
:key="topic.id"
13+
v-html="topic.name"
14+
></nuxt-link>
15+
</span>
1516
</span>
1617
</div>
1718
<nuxt-link :to="`/${article.slug}`" class="row">
@@ -102,16 +103,12 @@ export default {
102103
margin-bottom: 12px;
103104
text-transform: uppercase;
104105
105-
.topic {
106-
& + .topic {
107-
margin-left: 8px;
106+
.topic:not(:last-child) {
107+
margin-right: 4px;
108108
109-
&::before {
110-
content: ', ';
111-
color: $primary;
112-
left: -7px;
113-
position: absolute;
114-
}
109+
&::after {
110+
content: ', ';
111+
color: $primary;
115112
}
116113
}
117114
@@ -196,13 +193,3 @@ export default {
196193
}
197194
}
198195
</style>
199-
200-
<style lang="scss">
201-
.article-list {
202-
article {
203-
.excerpt {
204-
font-weight: 300;
205-
}
206-
}
207-
}
208-
</style>

components/TheHeaderSearch.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ section {
457457
}
458458
459459
.title {
460-
font-weight: 700;
460+
color: #000;
461461
line-height: 18px;
462462
max-height: 36px;
463463
-webkit-line-clamp: 2;

components/TheSidebar.vue

-4
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,6 @@ aside {
106106
}
107107
108108
article {
109-
div {
110-
font-weight: 300;
111-
}
112-
113109
& + article {
114110
border-top: 1px dotted lighten($primary, 20%);
115111
margin-top: 32px;

layouts/default.vue

+2-19
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<template>
22
<div class="blog" id="blog">
3-
<Spinner1 />
43
<div class="interface">
54
<TheHeader />
65
<main role="main">
@@ -14,13 +13,11 @@
1413
<script>
1514
import TheHeader from '../components/TheHeader';
1615
import TheFooter from '../components/TheFooter';
17-
import Spinner1 from '~/components/Spinner1';
1816
1917
export default {
2018
components: {
2119
TheHeader,
22-
TheFooter,
23-
Spinner1
20+
TheFooter
2421
}
2522
};
2623
</script>
@@ -62,30 +59,20 @@ html {
6259
6360
body {
6461
font-size: 0.85rem;
65-
font-weight: 300;
6662
line-height: 1.765em;
6763
}
6864
6965
#blog {
7066
> .interface {
7167
display: flex;
7268
flex-direction: column;
73-
opacity: 0;
7469
overflow: hidden;
7570
padding-top: 80px;
7671
7772
@media (max-width: 700px) {
7873
padding-top: 60px;
7974
}
8075
}
81-
82-
> .spinner {
83-
display: block;
84-
left: calc(50% - 20px);
85-
position: absolute;
86-
top: calc(50vh - 20px - 64px);
87-
z-index: 10;
88-
}
8976
}
9077
9178
html.wf-active #blog,
@@ -127,10 +114,6 @@ main {
127114
margin-bottom: 32px;
128115
129116
h1 {
130-
font-family: 'Roboto', sans-serif;
131-
font-size: 3rem;
132-
font-weight: 100;
133-
line-height: 1;
134117
margin-bottom: 12px;
135118
margin-top: 0;
136119
padding-bottom: 0;
@@ -147,7 +130,7 @@ h3,
147130
h4,
148131
h5 {
149132
color: #333;
150-
font-weight: 400;
133+
font-weight: 500;
151134
}
152135
153136
a {

nuxt.config.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ export default {
1414
content: process.env.npm_package_description || ''
1515
}
1616
],
17-
link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }]
17+
link: [
18+
{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },
19+
{ rel: 'stylesheet', href: 'https://fonts.googleapis.com/css?family=Roboto+Slab:400,500|Roboto:300,400&display=fallback' }
20+
]
1821
},
1922

2023
loading: { color: '#fff' },
@@ -24,7 +27,6 @@ export default {
2427
plugins: [
2528
{ src: '~/plugins/vue-lazyload', ssr: false },
2629
{ src: '~/plugins/vue-scrollto', ssr: false },
27-
{ src: '~/plugins/web-font-loader', ssr: false },
2830
{ src: '~/plugins/disqus' },
2931
{ src: '~/plugins/mixins' }
3032
],

package.json

-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
"node-vibrant": "^3.1.5",
2525
"normalize.css": "^8.0.1",
2626
"nuxt": "^2.11.0",
27-
"sanitize-html": "^1.21.1",
2827
"vue-disqus": "^3.0.5",
2928
"vue-infinite-loading": "^2.4.4",
3029
"vue-lazyload": "^1.3.3",
@@ -39,7 +38,6 @@
3938
"node-sass": "^4.13.1",
4039
"prettier": "^1.19.1",
4140
"sass-loader": "^8.0.2",
42-
"webfontloader": "^1.6.28",
4341
"webpack": "^4.41.5"
4442
}
4543
}

pages/authors/index.vue

-4
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@ export default {
6363
page-break-inside: avoid;
6464
break-inside: avoid;
6565
66-
a {
67-
font-weight: 300;
68-
}
69-
7066
& + li {
7167
margin-top: 32px;
7268
}

pages/topics/index.vue

-4
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,6 @@ export default {
6767
page-break-inside: avoid;
6868
break-inside: avoid;
6969
70-
a {
71-
font-weight: 300;
72-
}
73-
7470
& + li {
7571
margin-top: 32px;
7672
}

plugins/web-font-loader.js

-8
This file was deleted.

yarn.lock

+3-62
Original file line numberDiff line numberDiff line change
@@ -1639,11 +1639,6 @@ [email protected]:
16391639
resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
16401640
integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
16411641

1642-
array-uniq@^1.0.2:
1643-
version "1.0.3"
1644-
resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
1645-
integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
1646-
16471642
array-unique@^0.3.2:
16481643
version "0.3.2"
16491644
resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
@@ -4062,7 +4057,7 @@ html-webpack-plugin@^3.2.0:
40624057
toposort "^1.0.0"
40634058
util.promisify "1.0.0"
40644059

4065-
htmlparser2@^3.10.0, htmlparser2@^3.3.0:
4060+
htmlparser2@^3.3.0:
40664061
version "3.10.1"
40674062
resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
40684063
integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
@@ -4842,26 +4837,6 @@ lodash._reinterpolate@^3.0.0:
48424837
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
48434838
integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
48444839

4845-
lodash.clonedeep@^4.5.0:
4846-
version "4.5.0"
4847-
resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
4848-
integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
4849-
4850-
lodash.escaperegexp@^4.1.2:
4851-
version "4.1.2"
4852-
resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
4853-
integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
4854-
4855-
lodash.isplainobject@^4.0.6:
4856-
version "4.0.6"
4857-
resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
4858-
integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
4859-
4860-
lodash.isstring@^4.0.1:
4861-
version "4.0.1"
4862-
resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
4863-
integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
4864-
48654840
lodash.kebabcase@^4.1.1:
48664841
version "4.1.1"
48674842
resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
@@ -4872,11 +4847,6 @@ lodash.memoize@^4.1.2:
48724847
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
48734848
integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
48744849

4875-
lodash.mergewith@^4.6.1:
4876-
version "4.6.2"
4877-
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
4878-
integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
4879-
48804850
lodash.template@^4.5.0:
48814851
version "4.5.0"
48824852
resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
@@ -5893,7 +5863,7 @@ phin@^2.9.1:
58935863
resolved "https://registry.yarnpkg.com/phin/-/phin-2.9.3.tgz#f9b6ac10a035636fb65dfc576aaaa17b8743125c"
58945864
integrity sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA==
58955865

5896-
"php-parser@github:glayzzle/php-parser#prettier":
5866+
php-parser@glayzzle/php-parser#prettier:
58975867
version "3.0.0-prerelease.9"
58985868
resolved "https://codeload.github.com/glayzzle/php-parser/tar.gz/3279b7ee9bd78b914b5b840edc749eee0fabbfd8"
58995869

@@ -7178,22 +7148,6 @@ safe-regex@^1.1.0:
71787148
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
71797149
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
71807150

7181-
sanitize-html@^1.21.1:
7182-
version "1.21.1"
7183-
resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.21.1.tgz#1647d15c0c672901aa41eac1b86d0c38146d30ce"
7184-
integrity sha512-W6enXSVphVaVbmVbzVngBthR5f5sMmhq3EfPfBlzBzp2WnX8Rnk7NGpP7KmHUc0Y3MVk9tv/+CbpdHchX9ai7g==
7185-
dependencies:
7186-
chalk "^2.4.1"
7187-
htmlparser2 "^3.10.0"
7188-
lodash.clonedeep "^4.5.0"
7189-
lodash.escaperegexp "^4.1.2"
7190-
lodash.isplainobject "^4.0.6"
7191-
lodash.isstring "^4.0.1"
7192-
lodash.mergewith "^4.6.1"
7193-
postcss "^7.0.5"
7194-
srcset "^1.0.0"
7195-
xtend "^4.0.1"
7196-
71977151
sass-graph@^2.2.4:
71987152
version "2.2.4"
71997153
resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
@@ -7518,14 +7472,6 @@ sprintf-js@~1.0.2:
75187472
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
75197473
integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
75207474

7521-
srcset@^1.0.0:
7522-
version "1.0.0"
7523-
resolved "https://registry.yarnpkg.com/srcset/-/srcset-1.0.0.tgz#a5669de12b42f3b1d5e83ed03c71046fc48f41ef"
7524-
integrity sha1-pWad4StC87HV6D7QPHEEb8SPQe8=
7525-
dependencies:
7526-
array-uniq "^1.0.2"
7527-
number-is-nan "^1.0.0"
7528-
75297475
sshpk@^1.7.0:
75307476
version "1.16.1"
75317477
resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
@@ -8433,11 +8379,6 @@ watchpack@^1.6.0:
84338379
graceful-fs "^4.1.2"
84348380
neo-async "^2.5.0"
84358381

8436-
webfontloader@^1.6.28:
8437-
version "1.6.28"
8438-
resolved "https://registry.yarnpkg.com/webfontloader/-/webfontloader-1.6.28.tgz#db786129253cb6e8eae54c2fb05f870af6675bae"
8439-
integrity sha1-23hhKSU8tujq5UwvsF+HCvZnW64=
8440-
84418382
webpack-bundle-analyzer@^3.6.0:
84428383
version "3.6.0"
84438384
resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.0.tgz#39b3a8f829ca044682bc6f9e011c95deb554aefd"
@@ -8685,7 +8626,7 @@ xmlbuilder@~11.0.0:
86858626
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
86868627
integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
86878628

8688-
xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
8629+
xtend@^4.0.0, xtend@~4.0.1:
86898630
version "4.0.2"
86908631
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
86918632
integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==

0 commit comments

Comments
 (0)