Upgrade font awesome from 4.7 to 6.2.1

whatsopt · Nov 19, 2022 · 4e8654f · 4e8654f
1 parent 2a590c2
commit 4e8654f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -114,7 +114,7 @@ gem "rubyzip", "~>2.3.0"
 # UI
 gem "popper" # bootstrap dependency
 gem "bootstrap", "~> 5.0"
-gem "font_awesome5_rails"
+gem "font-awesome-sass", "~> 6.2.1"
 
 # thrift
 gem "thrift", "~>0.16"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -148,9 +148,8 @@ GEM
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.1)
     ffi (1.15.5)
-    font_awesome5_rails (1.5.0)
-      nokogiri (>= 1.11.3)
-      railties (>= 4.2)
+    font-awesome-sass (6.2.1)
+      sassc (~> 2.0)
     formatador (1.1.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
@@ -479,7 +478,7 @@ DEPENDENCIES
   deepsort
   devise (>= 4.7.1)
   devise_ldap_authenticatable
-  font_awesome5_rails
+  font-awesome-sass (~> 6.2.1)
   guard
   guard-minitest
   highline
@@ -520,4 +519,4 @@ RUBY VERSION
    ruby 3.0.3p157
 
 BUNDLED WITH
-   2.2.33
+   2.3.13
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -14,7 +14,7 @@
 //= require swagger-ui-react/swagger-ui
 
 @import "bootstrap";
-@import "font_awesome5_webfont";
+@import "font-awesome";
 @import "xdsmjs";
 @import "mda_viewer";
 @import "react-bootstrap-typeahead/Typeahead";