From 0e4ce1f978e9ba28707d006b719ddabebf2da8dc Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 21 Apr 2020 15:12:28 +0700 Subject: [PATCH] [ticket/16452] Upgrade to FontAwesome 5 PHPBB3-16452 --- phpBB/adm/style/admin.css | 11 +- phpBB/adm/style/overall_header.html | 1 + phpBB/assets/css/all.min.css | 5 + phpBB/assets/css/font-awesome.min.css | 4 - .../css/phpbb-fontawesome-v4-shims.min.css | 12 + phpBB/assets/fonts/FontAwesome.otf | Bin 134808 -> 0 bytes phpBB/assets/fonts/fontawesome-webfont.eot | Bin 165742 -> 0 bytes phpBB/assets/fonts/fontawesome-webfont.svg | 2671 --------- phpBB/assets/fonts/fontawesome-webfont.ttf | Bin 165548 -> 0 bytes phpBB/assets/fonts/fontawesome-webfont.woff | Bin 98024 -> 0 bytes phpBB/assets/fonts/fontawesome-webfont.woff2 | Bin 77160 -> 0 bytes phpBB/assets/webfonts/fa-brands-400.eot | Bin 0 -> 133034 bytes phpBB/assets/webfonts/fa-brands-400.svg | 3570 ++++++++++++ phpBB/assets/webfonts/fa-brands-400.ttf | Bin 0 -> 132728 bytes phpBB/assets/webfonts/fa-brands-400.woff | Bin 0 -> 89824 bytes phpBB/assets/webfonts/fa-brands-400.woff2 | Bin 0 -> 76612 bytes phpBB/assets/webfonts/fa-regular-400.eot | Bin 0 -> 34390 bytes phpBB/assets/webfonts/fa-regular-400.svg | 803 +++ phpBB/assets/webfonts/fa-regular-400.ttf | Bin 0 -> 34092 bytes phpBB/assets/webfonts/fa-regular-400.woff | Bin 0 -> 16800 bytes phpBB/assets/webfonts/fa-regular-400.woff2 | Bin 0 -> 13584 bytes phpBB/assets/webfonts/fa-solid-900.eot | Bin 0 -> 202902 bytes phpBB/assets/webfonts/fa-solid-900.svg | 4938 +++++++++++++++++ phpBB/assets/webfonts/fa-solid-900.ttf | Bin 0 -> 202616 bytes phpBB/assets/webfonts/fa-solid-900.woff | Bin 0 -> 103300 bytes phpBB/assets/webfonts/fa-solid-900.woff2 | Bin 0 -> 79444 bytes phpBB/includes/functions.php | 5 +- phpBB/includes/functions_acp.php | 4 +- .../data/v33x/font_awesome_5_update.php | 31 + .../prosilver/template/overall_footer.html | 4 +- .../prosilver/template/overall_header.html | 1 + .../prosilver/template/simple_header.html | 1 + phpBB/styles/prosilver/theme/common.css | 2 +- phpBB/styles/prosilver/theme/icons.css | 8 +- 34 files changed, 9383 insertions(+), 2688 deletions(-) create mode 100644 phpBB/assets/css/all.min.css delete mode 100644 phpBB/assets/css/font-awesome.min.css create mode 100644 phpBB/assets/css/phpbb-fontawesome-v4-shims.min.css delete mode 100644 phpBB/assets/fonts/FontAwesome.otf delete mode 100644 phpBB/assets/fonts/fontawesome-webfont.eot delete mode 100644 phpBB/assets/fonts/fontawesome-webfont.svg delete mode 100644 phpBB/assets/fonts/fontawesome-webfont.ttf delete mode 100644 phpBB/assets/fonts/fontawesome-webfont.woff delete mode 100644 phpBB/assets/fonts/fontawesome-webfont.woff2 create mode 100644 phpBB/assets/webfonts/fa-brands-400.eot create mode 100644 phpBB/assets/webfonts/fa-brands-400.svg create mode 100644 phpBB/assets/webfonts/fa-brands-400.ttf create mode 100644 phpBB/assets/webfonts/fa-brands-400.woff create mode 100644 phpBB/assets/webfonts/fa-brands-400.woff2 create mode 100644 phpBB/assets/webfonts/fa-regular-400.eot create mode 100644 phpBB/assets/webfonts/fa-regular-400.svg create mode 100644 phpBB/assets/webfonts/fa-regular-400.ttf create mode 100644 phpBB/assets/webfonts/fa-regular-400.woff create mode 100644 phpBB/assets/webfonts/fa-regular-400.woff2 create mode 100644 phpBB/assets/webfonts/fa-solid-900.eot create mode 100644 phpBB/assets/webfonts/fa-solid-900.svg create mode 100644 phpBB/assets/webfonts/fa-solid-900.ttf create mode 100644 phpBB/assets/webfonts/fa-solid-900.woff create mode 100644 phpBB/assets/webfonts/fa-solid-900.woff2 create mode 100644 phpBB/phpbb/db/migration/data/v33x/font_awesome_5_update.php diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 3243d0eb24..b5a66914f1 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -2639,7 +2639,7 @@ fieldset.permissions .padding { .send-stats-tile h2 { margin-top: 0; text-align: center; - padding-bottom: 1em; + padding-bottom: 1em; } .send-stats-tile i { @@ -2647,7 +2647,8 @@ fieldset.permissions .padding { } .icon { - font-family: FontAwesome; + font-family: 'Font Awesome 5 Free', 'Font Awesome 5 Brands'; + font-weight: 900; font-style: normal; } @@ -2698,13 +2699,15 @@ fieldset.permissions .padding { } .send-stats-settings input[type=checkbox] + label:before { - content: "\f096"; - font-family: FontAwesome; + content: "\f0c8"; + font-family: 'Font Awesome 5 Free'; + font-weight: normal; font-size: 1.5em; } .send-stats-settings input[type=checkbox]:checked + label:before { content: "\f14a"; + font-weight: bold; color: #3c763d; } 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 905d25096f..1c2d08adf6 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 eb04c66223..ec278d6471 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 normal 14px/1 FontAwesome; + font: normal normal bold 14px/1 'Font Awesome 5 Free'; 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 3ac598486c..9d5ccc1488 100644 --- a/phpBB/styles/prosilver/theme/icons.css +++ b/phpBB/styles/prosilver/theme/icons.css @@ -11,10 +11,10 @@ */ .icon, .button .icon, blockquote cite:before, .uncited:before { display: inline-block; - font-weight: normal; + font-weight: 900; font-style: normal; font-variant: normal; - font-family: FontAwesome; + font-family: 'Font Awesome 5 Free', 'Font Awesome 5 Brands'; font-size: 14px; line-height: 1; text-rendering: auto; /* optimizelegibility throws things off #1094 */ @@ -22,9 +22,9 @@ -moz-osx-font-smoothing: grayscale; } -.icon:before { padding-right: 2px; } +.icon { padding-right: 2px; } -.button .icon:before { +.button .icon { padding-right: 0; }