diff --git a/Gemfile b/Gemfile index 842e09a1..a44ebae1 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'rails', '~> 6.0.4' gem 'sassc-rails', '~> 2.1.2' gem 'bootstrap-sass', '3.4.1' -gem 'font-awesome-sass', '~> 5.15.1' +gem 'font-awesome-sass', '~> 6.1.2' gem 'uglifier', '>=1.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 82cfa01f..56c3690e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -114,8 +114,8 @@ GEM factory_bot (~> 6.2.0) railties (>= 5.0.0) ffi (1.15.5) - font-awesome-sass (5.15.1) - sassc (>= 1.11) + font-awesome-sass (6.1.2) + sassc (~> 2.0) globalid (1.0.0) activesupport (>= 5.0) highline (2.0.3) @@ -342,7 +342,7 @@ DEPENDENCIES coffee-rails (~> 5.0.0) database_cleaner factory_bot_rails - font-awesome-sass (~> 5.15.1) + font-awesome-sass (~> 6.1.2) htmlentities i18n-tasks (~> 1.0.11) jquery-rails (~> 4.4) diff --git a/app/assets/stylesheets/include/icons.scss b/app/assets/stylesheets/include/icons.scss index 001bc336..3141837b 100644 --- a/app/assets/stylesheets/include/icons.scss +++ b/app/assets/stylesheets/include/icons.scss @@ -1,2 +1 @@ -@import "font-awesome-sprockets"; @import "font-awesome"; diff --git a/test/helpers/icon_helper_test.rb b/test/helpers/icon_helper_test.rb index 90eaf3f4..8a40742a 100644 --- a/test/helpers/icon_helper_test.rb +++ b/test/helpers/icon_helper_test.rb @@ -4,10 +4,10 @@ class IconHelperTest < ActionView::TestCase include IconHelper test 'icon_fw generates fixed-width class' do - assert_equal '', icon_fw('fas', 'gear') + assert_equal '', icon_fw('fas', 'gear') end test 'icon_fw accepts an additional class' do - assert_equal '', icon_fw('fas', 'gear', class: 'myclass') + assert_equal '', icon_fw('fas', 'gear', class: 'myclass') end end