diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 32c0165b59..c1f23f03d0 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -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,12 @@ fieldset.permissions .padding {
}
.send-stats-settings input[type=checkbox] + label:before {
- font-family: "Font Awesome 5 Free";
+ content: "\f096";
+ 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;
}
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index d6f1cf73d7..fa361d6016 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -8,7 +8,6 @@
{PAGE_TITLE}
-
-
diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html
index 1c2d08adf6..905d25096f 100644
--- a/phpBB/styles/prosilver/template/simple_header.html
+++ b/phpBB/styles/prosilver/template/simple_header.html
@@ -24,7 +24,6 @@
-
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index e356bc9f18..eb04c66223 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -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;
diff --git a/phpBB/styles/prosilver/theme/icons.css b/phpBB/styles/prosilver/theme/icons.css
index e3919a227e..16cc31e143 100644
--- a/phpBB/styles/prosilver/theme/icons.css
+++ b/phpBB/styles/prosilver/theme/icons.css
@@ -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;
}
diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css
index dd30ee42da..d4ea454e75 100644
--- a/phpBB/styles/prosilver/theme/stylesheet.css
+++ b/phpBB/styles/prosilver/theme/stylesheet.css
@@ -10,12 +10,12 @@
@import url("normalize.css?hash=48eb3f89");
@import url("base.css?hash=3a7fafb1");
@import url("utilities.css?hash=1034bac8");
-@import url("common.css?hash=009a715d");
+@import url("common.css?hash=70bd1301");
@import url("links.css?hash=da040ebb");
@import url("content.css?hash=d7d65e66");
@import url("buttons.css?hash=15c14833");
@import url("cp.css?hash=5cc9ac0c");
@import url("forms.css?hash=18ee8211");
-@import url("icons.css?hash=ed93c566");
+@import url("icons.css?hash=dbc0f3b9");
@import url("colours.css?hash=3b03ccfa");
@import url("responsive.css?hash=438ff202");
diff --git a/tests/functional/forum_style_test.php b/tests/functional/forum_style_test.php
index 2f75517f8f..b3c1115b7f 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(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');