From 077958bc5c309fd03b545adf4a4a5b6b61fad975 Mon Sep 17 00:00:00 2001 From: Andreas Nedbal Date: Tue, 3 Jan 2023 16:15:39 +0100 Subject: [PATCH] Install Font Awesome 6 --- app/assets/config/manifest.js | 2 +- app/assets/stylesheets/application.sass.scss | 6 +++++- config/initializers/assets.rb | 2 +- package.json | 2 +- yarn.lock | 10 +++++----- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index 57a47bd4..f5fc2551 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -1,5 +1,5 @@ //= link_tree ../builds // If you link assets from node_modules, don't forget to include them in config/initializers/assets.rb -//= link_tree ../../../node_modules/font-awesome/fonts +//= link_tree ../../../node_modules/@fortawesome/fontawesome-free/webfonts //= link_tree ../../../node_modules/@fontsource/lexend/files diff --git a/app/assets/stylesheets/application.sass.scss b/app/assets/stylesheets/application.sass.scss index 359569e0..f53a45ab 100644 --- a/app/assets/stylesheets/application.sass.scss +++ b/app/assets/stylesheets/application.sass.scss @@ -17,7 +17,11 @@ @import "@melloware/coloris/dist/coloris", "bootstrap/scss/bootstrap", "croppr/dist/croppr", -"font-awesome/scss/font-awesome", +"@fortawesome/fontawesome-free/scss/fontawesome", +"@fortawesome/fontawesome-free/scss/solid", +"@fortawesome/fontawesome-free/scss/regular", +"@fortawesome/fontawesome-free/scss/brands", +"@fortawesome/fontawesome-free/scss/v4-shims", "sweetalert/dist/sweetalert", "toastify-js/src/toastify"; diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 6dd055cd..2d5f9d4f 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -17,5 +17,5 @@ Rails.application.config.assets.resolve_assets_in_css_urls = true # Include node assets in asset loading # This is IMPORTANT because in either environment (especially local) external assets # will not be found/resolved otherwise -Rails.application.config.assets.paths << Rails.root.join("node_modules/font-awesome/fonts") +Rails.application.config.assets.paths << Rails.root.join("node_modules/@fortawesome/fontawesome-free/webfonts") Rails.application.config.assets.paths << Rails.root.join("node_modules/@fontsource/lexend/files") diff --git a/package.json b/package.json index a38aafbe..fb3230ac 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "dependencies": { "@babel/preset-typescript": "^7.18.6", "@fontsource/lexend": "^4.5.13", + "@fortawesome/fontawesome-free": "^6.2.1", "@hotwired/stimulus": "^3.2.1", "@hotwired/stimulus-webpack-helpers": "^1.0.1", "@hotwired/turbo-rails": "^7.2.4", @@ -16,7 +17,6 @@ "cheet.js": "^0.3.3", "core-js": "^3.27.1", "croppr": "^2.3.1", - "font-awesome": "4.7.0", "i18n-js": "^4.0", "jquery": "^3.6.3", "js-cookie": "2.2.1", diff --git a/yarn.lock b/yarn.lock index 95052883..5c923008 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1099,6 +1099,11 @@ resolved "https://registry.yarnpkg.com/@fontsource/lexend/-/lexend-4.5.13.tgz#a22076e1393af0f075e945fcffc9ffa514805304" integrity sha512-lJjBMU9Jmi2a/QqLRBhwe862385UyS2RckS3ATr8jHAq1JFLxox2p2gODNzhaWo0ZwTjDxIJ0YfMiEzSdyqZ0w== +"@fortawesome/fontawesome-free@^6.2.1": + version "6.2.1" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz#344baf6ff9eaad7a73cff067d8c56bfc11ae5304" + integrity sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A== + "@gar/promisify@^1.0.1": version "1.1.2" resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" @@ -3745,11 +3750,6 @@ follow-redirects@^1.0.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== -font-awesome@4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" - integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM= - for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"