Skip to content

Commit 76238d3

Browse files
authored
Upgrade Font Awesome v5 -> v6 (hestiacp#3056)
* Upgrade Font Awesome v5 -> v6 - Add back missing Font Awesome "brands" * Update Font Awesome icon name references to v6
1 parent 607d040 commit 76238d3

File tree

90 files changed

+395
-5417
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+395
-5417
lines changed

web/css/src/dependencies/fontawesome-solid.css

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/*!
2+
* Some overrides of Font Awesome Free 6.2.1 to change webfont paths
3+
*/
4+
5+
@font-face {
6+
font-family: "Font Awesome 6 Free";
7+
font-style: normal;
8+
font-weight: 900;
9+
font-display: block;
10+
src: url("/webfonts/fa-solid-900.woff2") format("woff2"), url("/webfonts/fa-solid-900.ttf") format("truetype");
11+
}
12+
13+
@font-face {
14+
font-family: "Font Awesome 6 Brands";
15+
font-style: normal;
16+
font-weight: 400;
17+
font-display: block;
18+
src: url("/webfonts/fa-brands-400.woff2") format("woff2"), url("/webfonts/fa-brands-400.ttf") format("truetype");
19+
}

web/css/src/themes/default.css

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
@import url("normalize.css");
22
@import url("@fortawesome/fontawesome-free/css/fontawesome.css");
3-
@import url("../dependencies/fontawesome-solid.css");
3+
@import url("@fortawesome/fontawesome-free/css/brands.css");
4+
@import url("@fortawesome/fontawesome-free/css/solid.css");
5+
@import url("../dependencies/fontawesome.css");
46
@import url("../dependencies/animate.css");
57
@import url("../dependencies/jquery-ui.css");
68

@@ -920,8 +922,7 @@ table {
920922
inset -1px -1px 4px rgb(220 220 220 / 40%);
921923
}
922924

923-
.context-menu.sort-order span.name i.fas.fa-sort-amount-down,
924-
.context-menu.sort-order span.name i.fas.fa-sort-alpha-down {
925+
.context-menu.sort-order span.name i.fas.fa-arrow-down-a-z {
925926
float: right;
926927
margin-top: 2px;
927928
}

web/css/src/themes/vestia.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ a#btn-back:focus {
498498
box-shadow: none !important;
499499
}
500500

501-
.l-menu__item i.fas.fa-arrow-alt-circle-left {
501+
.l-menu__item i.fas.fa-circle-left {
502502
display: inline-block !important;
503503
}
504504

web/css/themes/default.min.css

Lines changed: 17 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/css/themes/vestia.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/inc/main.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,11 @@ function verify_csrf($method, $return = false)
220220
function show_alert_message($data) {
221221
if (!empty($data['error_msg']) || !empty($data['ok_msg'])) {
222222
if (!empty($data['error_msg'])) {
223-
$msg_icon = 'fa-exclamation-circle status-icon red';
223+
$msg_icon = 'fa-circle-exclamation status-icon red';
224224
$msg_text = htmlentities($data['error_msg']);
225225
$msg_id = 'vst-error';
226226
} else {
227-
$msg_icon = 'fa-check-circle status-icon green';
227+
$msg_icon = 'fa-circle-check status-icon green';
228228
$msg_text = $data['ok_msg'];
229229
$msg_id = 'vst-ok';
230230
}

web/js/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,6 @@ function elementHideShow(elementToHideOrShow,trigger){
10041004

10051005
if (typeof trigger !== 'undefined') {
10061006
trigger.querySelector('.section-toggle-icon').classList.toggle('fa-minus-square');
1007-
trigger.querySelector('.section-toggle-icon').classList.toggle('fa-plus-square');
1007+
trigger.querySelector('.section-toggle-icon').classList.toggle('fa-square-plus');
10081008
}
10091009
}

web/js/init.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ $(document).ready(function(){
123123
VE.tmp.sort_direction = $(this).hasClass('up')*1 || -1;
124124

125125
$('.l-sort .sort-by span b').html($(this).parent('li').find('.name').html());
126-
$('.l-sort .sort-by i').removeClass('fa-sort-alpha-up fa-sort-alpha-down');
127-
$(this).hasClass('up') ? $('.l-sort .sort-by i').addClass('fa-sort-alpha-up') : $('.l-sort .sort-by i').addClass('fa-sort-alpha-down');
126+
$('.l-sort .sort-by i').removeClass('fa-arrow-up-a-z fa-arrow-down-a-z');
127+
$(this).hasClass('up') ? $('.l-sort .sort-by i').addClass('fa-arrow-up-a-z') : $('.l-sort .sort-by i').addClass('fa-arrow-down-a-z');
128128
$('.units .l-unit').sort(function (a, b) {
129129
if(VE.tmp.sort_as_int)
130130
return parseInt($(a).attr(VE.tmp.sort_par)) >= parseInt($(b).attr(VE.tmp.sort_par)) ? VE.tmp.sort_direction : VE.tmp.sort_direction * -1;

web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"lint": "eslint js --fix && stylelint css/src/themes/*.css --fix"
1010
},
1111
"dependencies": {
12-
"@fortawesome/fontawesome-free": "^5.15.4",
12+
"@fortawesome/fontawesome-free": "^6.2.1",
1313
"normalize.css": "^8.0.1"
1414
},
1515
"devDependencies": {

0 commit comments

Comments
 (0)