mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 15:01:33 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
mrgoldy
2020-05-02 22:49:54 +02:00
parent c390b353c6 8ae115f9bd
commit 93cc9987cf
34 changed files with 9386 additions and 2694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/styles/prosilver/template/overall_footer.html
View File

@@ -81,7 +81,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();
}

1
phpBB/styles/prosilver/template/overall_header.html
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">

1
phpBB/styles/prosilver/template/simple_header.html
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">