makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16552] Roll back to FontAwesome 4.7

Browse source 
PHPBB3-16552
This commit is contained in:
3D-I 2020-07-21 05:12:04 +02:00 • committed by Marc Alexander
parent 2060f00f95
commit 4aa3a80558
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
10 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/adm/style/admin.css
View file

@ -2652,8 +2652,7 @@ fieldset.permissions .padding {
}
.icon {
font-family: "Font Awesome 5 Free", "Font Awesome 5 Brands";
font-weight: 900;
font-family: FontAwesome;
font-style: normal;
}
@ -2704,14 +2703,11 @@ fieldset.permissions .padding {
}
.send-stats-settings input[type=checkbox] + label:before {
font-family: "Font Awesome 5 Free";
font-family: FontAwesome;
font-size: 1.5em;
font-weight: normal;
content: "\f0c8";
}
.send-stats-settings input[type=checkbox]:checked + label:before {
font-weight: bold;
content: "\f14a";
color: #3c763d;
}

1
phpBB/adm/style/overall_header.html
View file

@ -8,7 +8,6 @@
<title>{PAGE_TITLE}</title>
<link href="{T_FONT_AWESOME_LINK}" rel="stylesheet">
<link href="{T_FONT_AWESOME_V4SHIMS_LINK}" rel="stylesheet">
<link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen" />
<script>

3
phpBB/includes/functions.php
View file

@ -4065,8 +4065,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
'T_STYLESHEET_LINK' => "{$web_path}styles/" . rawurlencode($user->style['style_path']) . '/theme/stylesheet.css?assets_version=' . $config['assets_version'],
'T_STYLESHEET_LANG_LINK'=> "{$web_path}styles/" . rawurlencode($user->style['style_path']) . '/theme/' . $user->lang_name . '/stylesheet.css?assets_version=' . $config['assets_version'],
'T_FONT_AWESOME_LINK' => !empty($config['allow_cdn']) && !empty($config['load_font_awesome_url']) ? $config['load_font_awesome_url'] : "{$web_path}assets/css/font-awesome.min.css?assets_version=" . $config['assets_version'],
'T_FONT_AWESOME_V4SHIMS_LINK' => "{$web_path}assets/css/phpbb-fontawesome-v4-shims.min.css?assets_version=" . $config['assets_version'],
'T_FONT_AWESOME_LINK' => !empty($config['allow_cdn']) && !empty($config['load_font_awesome_url']) ? $config['load_font_awesome_url'] : "{$web_path}assets/css/font-awesome.min.css?assets_version=" . $config['assets_version'],
'T_JQUERY_LINK' => !empty($config['allow_cdn']) && !empty($config['load_jquery_url']) ? $config['load_jquery_url'] : "{$web_path}assets/javascript/jquery-3.4.1.min.js?assets_version=" . $config['assets_version'],
'S_ALLOW_CDN' => !empty($config['allow_cdn']),

1
phpBB/includes/functions_acp.php
View file

@ -90,7 +90,6 @@ function adm_page_header($page_title)
'T_UPLOAD_PATH' => "{$phpbb_root_path}{$config['upload_path']}/",
'T_FONT_AWESOME_LINK' => !empty($config['allow_cdn']) && !empty($config['load_font_awesome_url']) ? $config['load_font_awesome_url'] : "{$phpbb_root_path}assets/css/font-awesome.min.css?assets_version=" . $config['assets_version'],
'T_FONT_AWESOME_V4SHIMS_LINK' => "{$phpbb_root_path}assets/css/phpbb-fontawesome-v4-shims.min.css?assets_version=" . $config['assets_version'],
'T_ASSETS_VERSION' => $config['assets_version'],

2
phpBB/styles/prosilver/template/overall_footer.html
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') !== 'Font Awesome 5 Free' ) {
if ($span.css('fontFamily') !== 'FontAwesome' ) {
$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,7 +46,6 @@
</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,7 +24,6 @@
</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">

2
phpBB/styles/prosilver/theme/common.css
View file

@ -363,7 +363,7 @@ a.header-avatar img {
a.header-avatar span:after {
content: '\f0dd';
display: inline-block;
font: normal normal bold 14px/1 "Font Awesome 5 Free";
font: normal normal normal 14px/1 FontAwesome;
padding-left: 6px;
padding-top: 2px;
vertical-align: top;

8
phpBB/styles/prosilver/theme/icons.css
View file

@ -11,8 +11,8 @@
*/
.icon, .button .icon, blockquote cite:before, .uncited:before {
display: inline-block;
font-family: "Font Awesome 5 Free", "Font Awesome 5 Brands";
font-weight: 900;
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
font-variant: normal;
font-size: 14px;
@ -22,9 +22,9 @@
-moz-osx-font-smoothing: grayscale;
}
.icon { padding-right: 2px; }
.icon:before { padding-right: 2px; }
.button .icon {
.button .icon:before {
padding-right: 0;
}

12
tests/functional/forum_style_test.php
View file

@ -31,13 +31,13 @@ class phpbb_functional_forum_style_test extends phpbb_functional_test_case
public function test_default_forum_style()
{
$crawler = self::request('GET', 'viewtopic.php?t=1&f=2');
$this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
$this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
$crawler = self::request('GET', 'viewtopic.php?t=1');
$this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
$this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
$crawler = self::request('GET', 'viewtopic.php?t=1&view=next');
$this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
$this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
}
public function test_custom_forum_style()
@ -47,13 +47,13 @@ class phpbb_functional_forum_style_test extends phpbb_functional_test_case
$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 2 WHERE forum_id = 2');
$crawler = self::request('GET', 'viewtopic.php?t=1&f=2');
$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
$crawler = self::request('GET', 'viewtopic.php?t=1');
$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
$crawler = self::request('GET', 'viewtopic.php?t=1&view=next');
$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 0 WHERE forum_id = 2');
$this->delete_style(2, 'test_style');