Update font-awesome version to 5.x

nomlab · Jun 21, 2021 · 3530ab5 · 3530ab5
1 parent 5d24ddb
commit 3530ab5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -102,7 +102,7 @@ gem 'bootstrap-sass', '~> 3.3.4'
 gem 'haml-rails'
 
 # for extension font
-gem 'font-awesome-sass', '~> 4.0'
+gem 'font-awesome-sass', '~> 5.0'
 
 gem 'kaminari'
 gem 'kaminari-bootstrap'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -108,8 +108,8 @@ GEM
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.1.0)
     ffi (1.15.0)
-    font-awesome-sass (4.7.0)
-      sass (>= 3.2)
+    font-awesome-sass (5.15.1)
+      sassc (>= 1.11)
     gemoji (3.0.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
@@ -264,6 +264,8 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
+    sassc (2.4.0)
+      ffi (~> 1.9)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -316,7 +318,7 @@ DEPENDENCIES
   capybara (>= 2.15)
   chromedriver-helper
   coffee-rails (~> 4.2)
-  font-awesome-sass (~> 4.0)
+  font-awesome-sass (~> 5.0)
   gemoji
   haml-rails
   html-pipeline (~> 2.14.0)

diff --git a/app/views/minutes/index.html.haml b/app/views/minutes/index.html.haml
@@ -25,9 +25,9 @@
         %td= minute.dtstart.strftime("%Y-%m-%d") rescue nil
         %td= minute.location
         %td= minute.author && minute.author.name
-        %td= link_to icon('pencil'), edit_minute_path(minute)
-        %td= link_to icon('repeat'), reuse_minute_path(minute)
-        %td= link_to icon('trash'), minute, method: :delete, data: { confirm: 'Are you sure?' }
+        %td= link_to icon('fas', 'pencil-alt'), edit_minute_path(minute)
+        %td= link_to icon('fas', 'redo-alt'), reuse_minute_path(minute)
+        %td= link_to icon('fas', 'trash-alt'), minute, method: :delete, data: { confirm: 'Are you sure?' }
 %br/
 = new_content :minute