From 8b5bcb6705533223dd8333559c3110d798c4b64d Mon Sep 17 00:00:00 2001 From: Kay Faraday Date: Sun, 12 Jun 2022 00:15:35 +0000 Subject: [PATCH] use internal fontawesome --- assets/style.scss | 10 +++++----- assets/variables.scss | 2 +- package.json | 2 +- server/routes/nouns.js | 2 +- yarn.lock | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assets/style.scss b/assets/style.scss index d1480281..8cbb3f66 100644 --- a/assets/style.scss +++ b/assets/style.scss @@ -37,11 +37,11 @@ @import "~bootstrap/scss/helpers"; @import "~bootstrap/scss/utilities/api"; -$fa-font-path: "~@fortawesome/fontawesome-pro/webfonts"; -@import "~@fortawesome/fontawesome-pro/scss/fontawesome"; -@import "~@fortawesome/fontawesome-pro/scss/light"; -@import "~@fortawesome/fontawesome-pro/scss/solid"; -@import "~@fortawesome/fontawesome-pro/scss/brands"; +$fa-font-path: "~fontawesome-pro/webfonts"; +@import "~fontawesome-pro/scss/fontawesome"; +@import "~fontawesome-pro/scss/light"; +@import "~fontawesome-pro/scss/solid"; +@import "~fontawesome-pro/scss/brands"; @import "./dark"; diff --git a/assets/variables.scss b/assets/variables.scss index 520bb1cc..cef64ec9 100644 --- a/assets/variables.scss +++ b/assets/variables.scss @@ -28,4 +28,4 @@ $wide-escape-size: 6rem; @import "~bootstrap/scss/mixins"; @import "~bootstrap/scss/utilities"; -@import '~@fortawesome/fontawesome-pro/scss/variables'; +@import '~fontawesome-pro/scss/_variables'; diff --git a/package.json b/package.json index 2363d3f3..7066695a 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "zh_cn_zh_tw": "^1.0.7" }, "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", "bootstrap": "^5.1.0", "clipboard": "^2.0.6", diff --git a/server/routes/nouns.js b/server/routes/nouns.js index cee95845..5e35676f 100644 --- a/server/routes/nouns.js +++ b/server/routes/nouns.js @@ -197,7 +197,7 @@ router.get('/nouns/:id.png', async (req, res) => { const mime = 'image/png'; 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 context = canvas.getContext('2d'); diff --git a/yarn.lock b/yarn.lock index 73714abe..59bfc314 100644 --- a/yarn.lock +++ b/yarn.lock @@ -869,10 +869,6 @@ resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" 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": version "2.1.4" 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" 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: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"