From 1735c7516e420bce85fa41ddfc388e3c253987be Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Sat, 19 Aug 2023 16:28:35 +0300 Subject: Upgrade to font awesome v5 This is a breaking change, since various fonts can break. Please verify all the icons are shown as intended (ideally find all the class names called "fa-*" and check them). Signed-off-by: Arthur Zamarin --- examples/tyrian.html | 6 +- package.json | 10 +- src/fonts/FontAwesome.otf | Bin 134808 -> 0 bytes src/fonts/fontawesome-webfont.eot | Bin 165742 -> 0 bytes src/fonts/fontawesome-webfont.svg | 2671 ----------------------------- src/fonts/fontawesome-webfont.ttf | Bin 165548 -> 0 bytes src/fonts/fontawesome-webfont.woff | Bin 98024 -> 0 bytes src/fonts/fontawesome-webfont.woff2 | Bin 77160 -> 0 bytes src/scss/compatibility/_fontawesome4.scss | 2 - src/scss/compatibility/_fontawesome5.scss | 6 + src/scss/tyrian.scss | 2 +- 11 files changed, 15 insertions(+), 2682 deletions(-) delete mode 100644 src/fonts/FontAwesome.otf delete mode 100644 src/fonts/fontawesome-webfont.eot delete mode 100644 src/fonts/fontawesome-webfont.svg delete mode 100644 src/fonts/fontawesome-webfont.ttf delete mode 100644 src/fonts/fontawesome-webfont.woff delete mode 100644 src/fonts/fontawesome-webfont.woff2 delete mode 100644 src/scss/compatibility/_fontawesome4.scss create mode 100644 src/scss/compatibility/_fontawesome5.scss diff --git a/examples/tyrian.html b/examples/tyrian.html index 71c0a33..71d1547 100644 --- a/examples/tyrian.html +++ b/examples/tyrian.html @@ -33,7 +33,7 @@ Wiki Bugs Forums - Devmanual + Devmanual Packages
Planet @@ -224,7 +224,7 @@
- © 2001–2018 Gentoo Foundation, Inc.
+ © 2001–2023 Gentoo Authors
Gentoo is a trademark of the Gentoo Foundation, Inc. The contents of this document, unless otherwise expressly stated, are licensed under the @@ -236,7 +236,7 @@
- + diff --git a/package.json b/package.json index 27f20cd..28fc50b 100644 --- a/package.json +++ b/package.json @@ -27,14 +27,14 @@ "copy:assets": "npm-run-all copy:js copy:img copy:fonts copy:tyrian:assets", "copy:js": "cp src/js/*.js dist", "copy:img": "cp src/img/*.* dist", - "copy:fonts": "cp src/fonts/*.* dist", + "copy:fonts": "cp src/fonts/*.* dist && cp node_modules/@fortawesome/fontawesome-free/webfonts/fa-*-*00.* dist", "copy:tyrian:assets": "cp ./node_modules/bootstrap/dist/js/bootstrap.min.js dist/bootstrap.min.js && cp ./node_modules/jquery/dist/jquery.slim.js dist/jquery-3.6.slim.js && cp ./node_modules/popper.js/dist/umd/popper.min.js dist" }, "dependencies": { - "autoprefixer": "^10.4.14", + "@fortawesome/fontawesome-free": "5.15.4", + "autoprefixer": "^10.4.15", "bootstrap": "4.6.2", - "font-awesome": "4.7.0", - "jquery": "^3.6.4", - "popper.js": "^1.16.0" + "jquery": "^3.7.0", + "popper.js": "^1.16.1" } } diff --git a/src/fonts/FontAwesome.otf b/src/fonts/FontAwesome.otf deleted file mode 100644 index 401ec0f..0000000 Binary files a/src/fonts/FontAwesome.otf and /dev/null differ diff --git a/src/fonts/fontawesome-webfont.eot b/src/fonts/fontawesome-webfont.eot deleted file mode 100644 index e9f60ca..0000000 Binary files a/src/fonts/fontawesome-webfont.eot and /dev/null differ diff --git a/src/fonts/fontawesome-webfont.svg b/src/fonts/fontawesome-webfont.svg deleted file mode 100644 index 855c845..0000000 --- a/src/fonts/fontawesome-webfont.svg +++ /dev/null @@ -1,2671 +0,0 @@ - - - - -Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016 - By ,,, -Copyright Dave Gandy 2016. All rights reserved. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fonts/fontawesome-webfont.ttf b/src/fonts/fontawesome-webfont.ttf deleted file mode 100644 index 35acda2..0000000 Binary files a/src/fonts/fontawesome-webfont.ttf and /dev/null differ diff --git a/src/fonts/fontawesome-webfont.woff b/src/fonts/fontawesome-webfont.woff deleted file mode 100644 index 400014a..0000000 Binary files a/src/fonts/fontawesome-webfont.woff and /dev/null differ diff --git a/src/fonts/fontawesome-webfont.woff2 b/src/fonts/fontawesome-webfont.woff2 deleted file mode 100644 index 4d13fc6..0000000 Binary files a/src/fonts/fontawesome-webfont.woff2 and /dev/null differ diff --git a/src/scss/compatibility/_fontawesome4.scss b/src/scss/compatibility/_fontawesome4.scss deleted file mode 100644 index 858b666..0000000 --- a/src/scss/compatibility/_fontawesome4.scss +++ /dev/null @@ -1,2 +0,0 @@ -$fa-font-path: "."; -@import "font-awesome/scss/font-awesome"; diff --git a/src/scss/compatibility/_fontawesome5.scss b/src/scss/compatibility/_fontawesome5.scss new file mode 100644 index 0000000..c53a676 --- /dev/null +++ b/src/scss/compatibility/_fontawesome5.scss @@ -0,0 +1,6 @@ +$fa-font-path: "."; +@import "@fortawesome/fontawesome-free/scss/brands"; +@import "@fortawesome/fontawesome-free/scss/solid"; +@import "@fortawesome/fontawesome-free/scss/regular"; +@import "@fortawesome/fontawesome-free/scss/fontawesome"; +@import "@fortawesome/fontawesome-free/scss/v4-shims"; diff --git a/src/scss/tyrian.scss b/src/scss/tyrian.scss index 464c83e..56ed736 100644 --- a/src/scss/tyrian.scss +++ b/src/scss/tyrian.scss @@ -19,4 +19,4 @@ @import "compatibility/tyrian-v1"; @import "compatibility/social-buttons"; -@import "compatibility/fontawesome4"; +@import "compatibility/fontawesome5"; -- cgit v1.2.3-65-gdbad