From 930729bf7423d96054b2996a9a1785ef268edad2 Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Tue, 27 Sep 2022 19:01:56 +0200 Subject: [PATCH] Use Font Awesome CSS --- README.md | 2 +- app/javascript/application.js | 1 - app/javascript/application.scss | 1 + app/javascript/stylesheets/fontawesome.scss | 7 +++++ app/views/pages/home.html.slim | 2 +- package.json | 5 +-- yarn.lock | 34 ++------------------- 7 files changed, 14 insertions(+), 38 deletions(-) create mode 100644 app/javascript/stylesheets/fontawesome.scss diff --git a/README.md b/README.md index c6174121..c85b721a 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This is an opinionated starter web application based on the following technology * [RSpec][5] * [Bootstrap 5.2.0][8] * [Autoprefixer][9] -* [Font Awesome 6.2.0 SVG][10] +* [Font Awesome 6.2.0 CSS][10] * [Slim][11] * [RuboCop][12] * [RuboCop RSpec][17] diff --git a/app/javascript/application.js b/app/javascript/application.js index de168900..d296c33e 100644 --- a/app/javascript/application.js +++ b/app/javascript/application.js @@ -6,7 +6,6 @@ import '@hotwired/turbo-rails' import 'src/bootstrap.js' -import 'src/fontawesome.js' require('@rails/ujs').start() require('@rails/activestorage').start() diff --git a/app/javascript/application.scss b/app/javascript/application.scss index 08ed7653..f243b3a7 100644 --- a/app/javascript/application.scss +++ b/app/javascript/application.scss @@ -1,2 +1,3 @@ @import "stylesheets/bootstrap"; +@import "stylesheets/fontawesome"; @import "stylesheets/turbo-progress-bar"; diff --git a/app/javascript/stylesheets/fontawesome.scss b/app/javascript/stylesheets/fontawesome.scss new file mode 100644 index 00000000..d1797b41 --- /dev/null +++ b/app/javascript/stylesheets/fontawesome.scss @@ -0,0 +1,7 @@ +// Main +@import "@fortawesome/fontawesome-free/scss/fontawesome"; + +// Styles +@import "@fortawesome/fontawesome-free/scss/brands"; +@import "@fortawesome/fontawesome-free/scss/regular"; +@import "@fortawesome/fontawesome-free/scss/solid"; diff --git a/app/views/pages/home.html.slim b/app/views/pages/home.html.slim index c2684f25..824682a6 100644 --- a/app/views/pages/home.html.slim +++ b/app/views/pages/home.html.slim @@ -15,5 +15,5 @@ ul.list-inline.lead | Bootstrap small.text-muted< 5.2.1 li.list-inline-item - | Font Awesome (SVG) + | Font Awesome (CSS) small.text-muted< 6.2.0 diff --git a/package.json b/package.json index 2a166115..a25535a3 100644 --- a/package.json +++ b/package.json @@ -11,10 +11,7 @@ "@babel/plugin-transform-runtime": "^7.19.1", "@babel/preset-env": "^7.19.1", "@babel/runtime": "^7.19.0", - "@fortawesome/fontawesome-svg-core": "^6.2.0", - "@fortawesome/free-brands-svg-icons": "^6.2.0", - "@fortawesome/free-regular-svg-icons": "^6.2.0", - "@fortawesome/free-solid-svg-icons": "^6.2.0", + "@fortawesome/fontawesome-free": "^6.2.0", "@hotwired/turbo-rails": "^7.2.0", "@popperjs/core": "^2.11.6", "@rails/actioncable": "6.1.7", diff --git a/yarn.lock b/yarn.lock index 7a023cdf..a29a66ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1066,38 +1066,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@fortawesome/fontawesome-common-types@6.2.0": +"@fortawesome/fontawesome-free@^6.2.0": version "6.2.0" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz#76467a94aa888aeb22aafa43eb6ff889df3a5a7f" - integrity sha512-rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg== - -"@fortawesome/fontawesome-svg-core@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.0.tgz#11856eaf4dd1d865c442ddea1eed8ee855186ba2" - integrity sha512-Cf2mAAeMWFMzpLC7Y9H1I4o3wEU+XovVJhTiNG8ZNgSQj53yl7OCJaS80K4YjrABWZzbAHVaoHE1dVJ27AAYXw== - dependencies: - "@fortawesome/fontawesome-common-types" "6.2.0" - -"@fortawesome/free-brands-svg-icons@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.0.tgz#ce072179677f9b5d6767f918cfbf296f357cc1d0" - integrity sha512-fm1y4NyZ2qKYNmYhdMz9VAWRw1Et7PMHNunSw3W0SVAwKwv6o0qiJworLH3Y9SnmhHzAymXJwCX1op22FFvGiA== - dependencies: - "@fortawesome/fontawesome-common-types" "6.2.0" - -"@fortawesome/free-regular-svg-icons@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.0.tgz#947e1f03be17da3a60bfeb2666b5348b19448ce2" - integrity sha512-M1dG+PAmkYMTL9BSUHFXY5oaHwBYfHCPhbJ8qj8JELsc9XCrUJ6eEHWip4q0tE+h9C0DVyFkwIM9t7QYyCpprQ== - dependencies: - "@fortawesome/fontawesome-common-types" "6.2.0" - -"@fortawesome/free-solid-svg-icons@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.0.tgz#8dcde48109354fd7a5ece8ea48d678bb91d4b5f0" - integrity sha512-UjCILHIQ4I8cN46EiQn0CZL/h8AwCGgR//1c4R96Q5viSRwuKVo0NdQEc4bm+69ZwC0dUvjbDqAHF1RR5FA3XA== - dependencies: - "@fortawesome/fontawesome-common-types" "6.2.0" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz#ba3510825b332816fe7190f28827f8cb33a298b5" + integrity sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ== "@hotwired/turbo-rails@^7.2.0": version "7.2.0"