diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index f05083dc18..77a2a794a3 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -2913,7 +2913,8 @@ fieldset.permissions .permissions-switch {
}
.icon {
- font-family: FontAwesome;
+ font-family: "Font Awesome 5 Free", "Font Awesome 5 Brands";
+ font-weight: 900;
font-style: normal;
}
@@ -2965,12 +2966,14 @@ fieldset.permissions .permissions-switch {
}
.send-stats-settings input[type="checkbox"] + label:before {
- font-family: FontAwesome;
+ font-family: "Font Awesome 5 Free";
font-size: 1.5em;
- content: "\f096";
+ font-weight: normal;
+ content: "\f0c8";
}
.send-stats-settings input[type="checkbox"]:checked + label:before {
+ font-weight: bold;
color: #3c763d;
content: "\f14a";
}
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index fa361d6016..d6f1cf73d7 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -8,6 +8,7 @@
{PAGE_TITLE}
+
+
diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html
index 5543ea0e03..2342fbc7e2 100644
--- a/phpBB/styles/prosilver/template/simple_header.html
+++ b/phpBB/styles/prosilver/template/simple_header.html
@@ -24,6 +24,7 @@
+
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 54048d500b..35a8fc8968 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -371,7 +371,7 @@ a.header-avatar img {
}
a.header-avatar span:after {
- font: normal normal normal 14px/1 FontAwesome;
+ font: normal normal bold 14px/1 "Font Awesome 5 Free";
vertical-align: top;
display: inline-block;
padding-top: 2px;
diff --git a/phpBB/styles/prosilver/theme/icons.css b/phpBB/styles/prosilver/theme/icons.css
index 1268627d51..28caa8cf10 100644
--- a/phpBB/styles/prosilver/theme/icons.css
+++ b/phpBB/styles/prosilver/theme/icons.css
@@ -13,9 +13,9 @@
.button .icon,
blockquote cite:before,
.uncited:before {
- font-family: FontAwesome;
+ font-family: "Font Awesome 5 Free", "Font Awesome 5 Brands";
font-size: 14px;
- font-weight: normal;
+ font-weight: 900;
font-style: normal;
font-variant: normal;
line-height: 1;
@@ -27,11 +27,7 @@ blockquote cite:before,
text-rendering: auto; /* optimizelegibility throws things off #1094 */
}
-.icon:before {
- padding-right: 2px;
-}
-
-.button .icon:before {
+.button .icon {
padding-right: 0;
}
diff --git a/tests/functional/forum_style_test.php b/tests/functional/forum_style_test.php
index b3c1115b7f..2f75517f8f 100644
--- a/tests/functional/forum_style_test.php
+++ b/tests/functional/forum_style_test.php
@@ -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(1)->attr('href'));
+ $this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
$crawler = self::request('GET', 'viewtopic.php?t=1');
- $this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
+ $this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
$crawler = self::request('GET', 'viewtopic.php?t=1&view=next');
- $this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
+ $this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->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(1)->attr('href'));
+ $this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
$crawler = self::request('GET', 'viewtopic.php?t=1');
- $this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
+ $this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
$crawler = self::request('GET', 'viewtopic.php?t=1&view=next');
- $this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
+ $this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 0 WHERE forum_id = 2');
$this->delete_style(2, 'test_style');