Skip to content

Commit 4f2c567

Browse files
Bump font-awesome
1 parent 8b7c89f commit 4f2c567

4 files changed

Lines changed: 8 additions & 7 deletions

File tree

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ gem 'rails', '~> 7.0.0'
1010
gem 'bootstrap-sass', '>= 3.4.1'
1111
gem 'bootswatch-rails'
1212
gem 'coffee-rails', '~> 5.0'
13-
gem 'font-awesome-rails', '~> 4.7'
13+
gem 'font_awesome5_rails'
1414
gem 'jbuilder', '~> 2.10'
1515
gem 'jquery-datatables-rails', '~> 3.4.0'
1616
gem 'jquery-rails', '~> 4.4'

Gemfile.lock

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,9 @@ GEM
141141
ruby2_keywords (>= 0.0.4)
142142
faraday-net_http (2.0.3)
143143
ffi (1.15.5)
144-
font-awesome-rails (4.7.0.8)
145-
railties (>= 3.2, < 8.0)
144+
font_awesome5_rails (1.5.0)
145+
nokogiri (>= 1.11.3)
146+
railties (>= 4.2)
146147
formatador (1.1.0)
147148
formtastic (4.0.0)
148149
actionpack (>= 5.2.0)
@@ -439,7 +440,7 @@ DEPENDENCIES
439440
devise
440441
factory_bot_rails
441442
faker
442-
font-awesome-rails (~> 4.7)
443+
font_awesome5_rails
443444
gravatar-ultimate (~> 2.0.0)
444445
guard
445446
guard-rubocop

app/assets/stylesheets/application.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import "normalize";
22
@import "flexiblegs.min";
33
@import "animate.min";
4-
@import "font-awesome";
4+
@import "font_awesome5_webfont";
55
@import "config";
66
@import "bootstrap-sprockets";
77
@import "bootstrap";

app/views/shared/_header.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
</div>
1919
<div>
2020
<%= link_to "https://slack.rubyturkiye.org/", target: "_blank" do %>
21-
<%= fa_icon "slack", text: "Slack" %>
21+
<%= fab_icon "slack-hash", text: "Slack" %>
2222
<% end %>
2323
</div>
2424
<div>
2525
<%= link_to "https://discuss.rubyturkiye.org/", target: "_blank" do %>
26-
<%= fa_icon "discourse", text: "Discourse" %>
26+
<%= fab_icon "discourse", text: "Discourse" %>
2727
<% end %>
2828
</div>
2929
<% if current_user %>

0 commit comments

Comments
 (0)