Compare commits

...
Author SHA1 Message Date
Aaron Carlisle 1336682def Update .gitignore 2021-03-20 12:29:09 -04:00
Aaron Carlisle 7bce653452 Build assets 2021-03-20 10:44:13 -04:00
Aaron Carlisle b8f0b9c62e Fonts: Use fontsource package for loading fonts
fontsource is the new defacto source for google fonts.
Originally, this was `typeface-*` however that is now deprecated.
Not sure why but there does not seem to be woff2 formats for the `all` character sets.
But the new fonts are already smaller than the old woff2 as we now only include the needed font weight.
2021-03-20 10:43:29 -04:00
22 changed files with 54 additions and 37 deletions

No files matched your search

-2
View File
@@ -17,8 +17,6 @@ local/
node_modules
npm-debug.log
pip-selfcheck.json
sphinx_rtd_theme/static/fonts/Lato/
sphinx_rtd_theme/static/fonts/RobotoSlab/
.python-version
.node-version
sphinx_rtd_theme/static/js/html5shiv.min.js
+42 -23
View File
@@ -4,6 +4,18 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"@fontsource/lato": {
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/@fontsource/lato/-/lato-4.2.2.tgz",
"integrity": "sha512-ZE5WvqZQZinXpH8MaEiM9klDsUOfCHVQJ/tZKpNVQhi8mHt9WqPCROu500oI5jC3s6jaJuWsM7LfJ1zyEeW+XA==",
"dev": true
},
"@fontsource/roboto-slab": {
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/@fontsource/roboto-slab/-/roboto-slab-4.2.2.tgz",
"integrity": "sha512-g1MNNpUXk8QpoHQeVuYtPL5abvUoUv0qFXDNhf3/0ABgMQ3TZwm/e9dHFvWKoNp0HFrC1Y2W3tBtUbX25w0nIA==",
"dev": true
},
"@types/events": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
@@ -2730,7 +2742,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
@@ -2751,12 +2764,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -2771,17 +2786,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
@@ -2898,7 +2916,8 @@
"inherits": {
"version": "2.0.4",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
@@ -2910,6 +2929,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -2924,6 +2944,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -2931,12 +2952,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.9.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -2955,6 +2978,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -3044,7 +3068,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
@@ -3056,6 +3081,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@@ -3141,7 +3167,8 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -3177,6 +3204,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -3196,6 +3224,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -3239,12 +3268,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"yallist": {
"version": "3.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
}
}
},
@@ -4269,12 +4300,6 @@
"webpack-sources": "^1.1.0"
}
},
"lato-font": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/lato-font/-/lato-font-3.0.0.tgz",
"integrity": "sha1-kbg34jdLZo+3Mx1EyJTTei2fjhE=",
"dev": true
},
"load-json-file": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -6435,12 +6460,6 @@
"inherits": "^2.0.1"
}
},
"roboto-fontface": {
"version": "0.10.0",
"resolved": "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.10.0.tgz",
"integrity": "sha512-OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g==",
"dev": true
},
"run-queue": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+2 -2
View File
@@ -24,15 +24,15 @@
"copy-webpack-plugin": "^5.1.1",
"css-loader": "^3.1.0",
"file-loader": "^3.0.1",
"@fontsource/lato": "^4.2.2",
"@fontsource/roboto-slab": "^4.2.2",
"font-awesome": "^4.7.0",
"html5shiv": "^3.7.3",
"imports-loader": "^0.8.0",
"jquery": "^3.4.1",
"lato-font": "^3.0.0",
"mini-css-extract-plugin": "^0.6.0",
"node-sass": "^4.13.1",
"optimize-css-assets-webpack-plugin": "^5.0.3",
"roboto-fontface": "^0.10.0",
"sass-loader": "^7.3.0",
"style-loader": "^0.23.1",
"webpack": "^4.30.0",
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+10 -10
View File
@@ -1,31 +1,31 @@
$lato-font-path: "~lato-font/fonts"
$roboto-font-path: "~roboto-fontface/fonts/roboto-slab"
$lato-font-path: "~@fontsource/lato/files"
$roboto-font-path: "~@fontsource/roboto-slab/files"
@font-face
font-family: 'Lato'
src: url('#{$lato-font-path}/lato-normal/lato-normal.woff2') format('woff2'), url('#{$lato-font-path}/lato-normal/lato-normal.woff') format('woff')
src: url('#{$lato-font-path}/lato-all-400-normal.woff') format('woff')
font-weight: 400
font-style: normal
font-display: $font-display
@font-face
font-family: 'Lato'
src: url('#{$lato-font-path}/lato-bold/lato-bold.woff2') format('woff2'), url('#{$lato-font-path}/lato-bold/lato-bold.woff') format('woff')
src: url('#{$lato-font-path}/lato-all-700-normal.woff') format('woff')
font-weight: 700
font-style: normal
font-display: $font-display
@font-face
font-family: 'Lato'
src: url('#{$lato-font-path}/lato-bold-italic/lato-bold-italic.woff2') format('woff2'), url('#{$lato-font-path}/lato-bold-italic/lato-bold-italic.woff') format('woff')
font-weight: 700
src: url('#{$lato-font-path}/lato-all-400-italic.woff') format('woff')
font-weight: 400
font-style: italic
font-display: $font-display
@font-face
font-family: 'Lato'
src: url('#{$lato-font-path}/lato-normal-italic/lato-normal-italic.woff2') format('woff2'), url('#{$lato-font-path}/lato-normal-italic/lato-normal-italic.woff') format('woff')
font-weight: 400
src: url('#{$lato-font-path}/lato-all-700-italic.woff') format('woff')
font-weight: 700
font-style: italic
font-display: $font-display
@@ -33,12 +33,12 @@ $roboto-font-path: "~roboto-fontface/fonts/roboto-slab"
font-family: 'Roboto Slab'
font-style: normal
font-weight: 400
src: url('#{$roboto-font-path}/Roboto-Slab-Regular.woff2') format('woff2'), url('#{$roboto-font-path}/Roboto-Slab-Regular.woff') format('woff')
src: url('#{$roboto-font-path}/roboto-slab-all-400-normal.woff') format('woff')
font-display: $font-display
@font-face
font-family: 'Roboto Slab'
font-style: normal
font-weight: 700
src: url('#{$roboto-font-path}/Roboto-Slab-Bold.woff2') format('woff2'), url('#{$roboto-font-path}/Roboto-Slab-Bold.woff') format('woff')
src: url('#{$roboto-font-path}/roboto-slab-all-700-normal.woff') format('woff')
font-display: $font-display