From 1838765baaadee5132cd2d156a196de293b205c5 Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Fri, 12 Aug 2022 10:34:06 +0200 Subject: [PATCH] Reinclude all FontAwesome SCSS files --- app/javascript/stylesheets.scss | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/app/javascript/stylesheets.scss b/app/javascript/stylesheets.scss index 93ccd5d5..9c1cb9c4 100644 --- a/app/javascript/stylesheets.scss +++ b/app/javascript/stylesheets.scss @@ -12,21 +12,7 @@ $web-font-path: '//'; @import '../../node_modules/bootstrap/scss/bootstrap'; @import '../../node_modules/bootswatch/dist/yeti/bootswatch'; $fa-font-path: '~@fortawesome/fontawesome-free/webfonts/'; -// Remove lines below and re-include overall fontawesome in v6.2+ -// See https://github.com/FortAwesome/Font-Awesome/issues/19237 -@import '../../node_modules/@fortawesome/fontawesome-free/scss/functions'; -@import '../../node_modules/@fortawesome/fontawesome-free/scss/variables'; -@import '../../node_modules/@fortawesome/fontawesome-free/scss/mixins'; -@import '../../node_modules/@fortawesome/fontawesome-free/scss/core'; -@import '../../node_modules/@fortawesome/fontawesome-free/scss/sizing'; -@import '../../node_modules/@fortawesome/fontawesome-free/scss/fixed-width'; -@import '../../node_modules/@fortawesome/fontawesome-free/scss/bordered-pulled'; -@import '../../node_modules/@fortawesome/fontawesome-free/scss/animated'; -@import '../../node_modules/@fortawesome/fontawesome-free/scss/rotated-flipped'; -@import '../../node_modules/@fortawesome/fontawesome-free/scss/stacked'; -@import '../../node_modules/@fortawesome/fontawesome-free/scss/icons'; -@import '../../node_modules/@fortawesome/fontawesome-free/scss/screen-reader'; -// @import '~@fortawesome/fontawesome-free/scss/fontawesome'; +@import '~@fortawesome/fontawesome-free/scss/fontawesome'; @import '../../node_modules/@fortawesome/fontawesome-free/scss/solid'; @import '../../node_modules/@fortawesome/fontawesome-free/scss/regular'; @import '../../node_modules/@fortawesome/fontawesome-free/scss/v4-shims';