Skip to content

Commit 63364fc

Browse files
authored
Merge pull request #144 from SINDAN/feature/fontawesome-v6
Update Font Awesome v6
2 parents cc90309 + 998dd47 commit 63364fc

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

app/views/layouts/application.html.slim

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ html
1616
nav.navbar.navbar-expand-md.navbar-dark.fixed-top.bg-dark
1717
.container
1818
a.navbar-brand href="#{root_path}"
19-
span.fa.fa-heartbeat.me-1
19+
span.fas.fa-heart-pulse.me-1
2020
| #{t('common.site_title')}
2121
button.navbar-toggler type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse"
2222
span.navbar-toggler-icon
@@ -58,11 +58,11 @@ html
5858
- else
5959
li.nav-item
6060
a.nav-link href="#{search_log_campaigns_path}" title="#{t('views.log_campaigns.search.title')}"
61-
i.fa.fa-search.me-1
61+
i.fas.fa-search.me-1
6262
| #{t('views.log_campaigns.search.title')}
6363
li.nav-item.dropdown
6464
a.nav-link.dropdown-toggle href="#" data-bs-toggle="dropdown"
65-
i.fa.fa-user.me-1
65+
i.far.fa-user.me-1
6666
| #{current_user.login}
6767
ul.dropdown-menu
6868
li

app/views/log_campaigns/search.html.slim

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
.input-group.date#datetime_from_group
1616
= f.text_field :datetime_from, value: @datetime_from, class: "form-control"
1717
span.input-group-text
18-
i.fa.fa-calendar
18+
i.far.fa-calendar-days
1919
.col-sm-4
2020
.input-group.date#datetime_to_group
2121
= f.text_field :datetime_to, value: @datetime_to, class: "form-control"
2222
span.input-group-text
23-
i.fa.fa-calendar
23+
i.far.fa-calendar-days
2424
.row
2525
.col-sm-10.ms-auto
2626
= f.submit t('views.log_campaigns.search.search_button'), name: nil, class: "btn btn-primary"

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"@babel/core": "^7.18.6",
99
"@babel/preset-env": "^7.18.6",
1010
"@eonasdan/tempus-dominus": "^6.9.10",
11-
"@fortawesome/fontawesome-free": "^5.15.3",
11+
"@fortawesome/fontawesome-free": "^6.0.0",
1212
"@popperjs/core": "^2.9.2",
1313
"alt-ujs": "^1.0.0",
1414
"babel-loader": "^9.0.0",

yarn.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)