FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Install Font Awesome 6

This commit is contained in:
Andreas Nedbal 2023-01-03 16:15:39 +01:00 committed by Andreas Nedbal
parent 7fa548b613
commit 077958bc5c
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/config/manifest.js
View File

@ -1,5 +1,5 @@
//= link_tree ../builds //= link_tree ../builds
// If you link assets from node_modules, don't forget to include them in config/initializers/assets.rb // 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 //= link_tree ../../../node_modules/@fontsource/lexend/files

6
app/assets/stylesheets/application.sass.scss
View File

@ -17,7 +17,11 @@
@import "@melloware/coloris/dist/coloris", @import "@melloware/coloris/dist/coloris",
"bootstrap/scss/bootstrap", "bootstrap/scss/bootstrap",
"croppr/dist/croppr", "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", "sweetalert/dist/sweetalert",
"toastify-js/src/toastify"; "toastify-js/src/toastify";

2
config/initializers/assets.rb
View File

@ -17,5 +17,5 @@ Rails.application.config.assets.resolve_assets_in_css_urls = true
# Include node assets in asset loading # Include node assets in asset loading
# This is IMPORTANT because in either environment (especially local) external assets # This is IMPORTANT because in either environment (especially local) external assets
# will not be found/resolved otherwise # 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") Rails.application.config.assets.paths << Rails.root.join("node_modules/@fontsource/lexend/files")

2
package.json
View File

@ -7,6 +7,7 @@
"dependencies": { "dependencies": {
"@babel/preset-typescript": "^7.18.6", "@babel/preset-typescript": "^7.18.6",
"@fontsource/lexend": "^4.5.13", "@fontsource/lexend": "^4.5.13",
"@fortawesome/fontawesome-free": "^6.2.1",
"@hotwired/stimulus": "^3.2.1", "@hotwired/stimulus": "^3.2.1",
"@hotwired/stimulus-webpack-helpers": "^1.0.1", "@hotwired/stimulus-webpack-helpers": "^1.0.1",
"@hotwired/turbo-rails": "^7.2.4", "@hotwired/turbo-rails": "^7.2.4",
@ -16,7 +17,6 @@
"cheet.js": "^0.3.3", "cheet.js": "^0.3.3",
"core-js": "^3.27.1", "core-js": "^3.27.1",
"croppr": "^2.3.1", "croppr": "^2.3.1",
"font-awesome": "4.7.0",
"i18n-js": "^4.0", "i18n-js": "^4.0",
"jquery": "^3.6.3", "jquery": "^3.6.3",
"js-cookie": "2.2.1", "js-cookie": "2.2.1",

10
yarn.lock
View File

@ -1099,6 +1099,11 @@
resolved "https://registry.yarnpkg.com/@fontsource/lexend/-/lexend-4.5.13.tgz#a22076e1393af0f075e945fcffc9ffa514805304" resolved "https://registry.yarnpkg.com/@fontsource/lexend/-/lexend-4.5.13.tgz#a22076e1393af0f075e945fcffc9ffa514805304"
integrity sha512-lJjBMU9Jmi2a/QqLRBhwe862385UyS2RckS3ATr8jHAq1JFLxox2p2gODNzhaWo0ZwTjDxIJ0YfMiEzSdyqZ0w== 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": "@gar/promisify@^1.0.1":
version "1.1.2" version "1.1.2"
resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" 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" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== 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: 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"