1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-21 07:51:33 +02:00

Merge pull request #5957 from rxu/ticket/16452

[ticket/16452] Upgrade to FontAwesome 5
This commit is contained in:
mrgoldy
2020-05-02 22:38:02 +02:00
34 changed files with 9387 additions and 2692 deletions

View File

@@ -73,7 +73,7 @@
(function($){
var $fa_cdn = $('head').find('link[rel="stylesheet"]').first(),
$span = $('<span class="fa" style="display:none"></span>').appendTo('body');
if ($span.css('fontFamily') !== 'FontAwesome' ) {
if ($span.css('fontFamily') !== 'Font Awesome 5 Free' ) {
$fa_cdn.after('<link href="{T_ASSETS_PATH}/css/font-awesome.min.css" rel="stylesheet">');
$fa_cdn.remove();
}

View File

@@ -46,6 +46,7 @@
</script>
<!-- ENDIF -->
<link href="{T_FONT_AWESOME_LINK}" rel="stylesheet">
<link href="{T_FONT_AWESOME_V4SHIMS_LINK}" rel="stylesheet">
<link href="{T_STYLESHEET_LINK}" rel="stylesheet">
<link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet">

View File

@@ -24,6 +24,7 @@
</script>
<!-- ENDIF -->
<link href="{T_FONT_AWESOME_LINK}" rel="stylesheet">
<link href="{T_FONT_AWESOME_V4SHIMS_LINK}" rel="stylesheet">
<link href="{T_STYLESHEET_LINK}" rel="stylesheet">
<link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet">