KayFaraday
/
Zaimki
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use internal fontawesome

This commit is contained in:
Kay Faraday 2022-06-12 00:15:35 +00:00
parent 57cdc72598
commit 8b5bcb6705
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/style.scss
View File

@ -37,11 +37,11 @@
@import "~bootstrap/scss/helpers"; @import "~bootstrap/scss/helpers";
@import "~bootstrap/scss/utilities/api"; @import "~bootstrap/scss/utilities/api";
$fa-font-path: "~@fortawesome/fontawesome-pro/webfonts"; $fa-font-path: "~fontawesome-pro/webfonts";
@import "~@fortawesome/fontawesome-pro/scss/fontawesome"; @import "~fontawesome-pro/scss/fontawesome";
@import "~@fortawesome/fontawesome-pro/scss/light"; @import "~fontawesome-pro/scss/light";
@import "~@fortawesome/fontawesome-pro/scss/solid"; @import "~fontawesome-pro/scss/solid";
@import "~@fortawesome/fontawesome-pro/scss/brands"; @import "~fontawesome-pro/scss/brands";
@import "./dark"; @import "./dark";

2
assets/variables.scss
View File

@ -28,4 +28,4 @@ $wide-escape-size: 6rem;
@import "~bootstrap/scss/mixins"; @import "~bootstrap/scss/mixins";
@import "~bootstrap/scss/utilities"; @import "~bootstrap/scss/utilities";
@import '~@fortawesome/fontawesome-pro/scss/variables'; @import '~fontawesome-pro/scss/_variables';

2
package.json
View File

@ -63,7 +63,7 @@
"zh_cn_zh_tw": "^1.0.7" "zh_cn_zh_tw": "^1.0.7"
}, },
"devDependencies": { "devDependencies": {
"@fortawesome/fontawesome-pro": "git+ssh://git@gitlab.com:Avris/FontAwesomePro.git", "fontawesome-pro": "git+ssh://gitea@lab.freak.university:33205/KayFaraday/FontAwesomePro.git",
"avris-daemonise": "^0.0.2", "avris-daemonise": "^0.0.2",
"bootstrap": "^5.1.0", "bootstrap": "^5.1.0",
"clipboard": "^2.0.6", "clipboard": "^2.0.6",

2
server/routes/nouns.js
View File

@ -197,7 +197,7 @@ router.get('/nouns/:id.png', async (req, res) => {
const mime = 'image/png'; const mime = 'image/png';
const fontName = registerLocaleFont('fontHeadings', ['regular', 'bold']); const fontName = registerLocaleFont('fontHeadings', ['regular', 'bold']);
registerFont('node_modules/@fortawesome/fontawesome-pro/webfonts/fa-light-300.ttf', { family: 'FontAwesome', weight: 'regular'}); registerFont('node_modules/fontawesome-pro/webfonts/fa-light-300.ttf', { family: 'FontAwesome', weight: 'regular'});
const canvas = createCanvas(width, height); const canvas = createCanvas(width, height);
const context = canvas.getContext('2d'); const context = canvas.getContext('2d');

8
yarn.lock
View File

@ -869,10 +869,6 @@
resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw== integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
"@fortawesome/fontawesome-pro@git+ssh://git@gitlab.com:Avris/FontAwesomePro.git":
version "5.13.1"
resolved "git+ssh://git@gitlab.com:Avris/FontAwesomePro.git#f00db606f659dca78b143b7bcab5671b2cb459a8"
"@nodelib/fs.scandir@2.1.4": "@nodelib/fs.scandir@2.1.4":
version "2.1.4" version "2.1.4"
resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
@ -4485,6 +4481,10 @@ follow-redirects@^1.0.0, follow-redirects@^1.10.0:
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267"
integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA== integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==
"fontawesome-pro@git+ssh://gitea@lab.freak.university:33205/KayFaraday/FontAwesomePro.git":
version "1.2.0"
resolved "git+ssh://gitea@lab.freak.university:33205/KayFaraday/FontAwesomePro.git#42dd37df603bdeae93fc4e6991f063798d81ac28"
for-in@^1.0.2: for-in@^1.0.2:
version "1.0.2" version "1.0.2"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"