Remove Font Awesome from WCFSetup

WCFSetup does not use any icons, thus there is no need to load them.

diff --git a/wcfsetup/install.php b/wcfsetup/install.php
index a22e16fd45fc75f91cbf36dc64bd92715c85eae3..57dd43faf13499ccc467abb0111a1dd59c1050ae 100644 (file)
--- a/wcfsetup/install.php
+++ b/wcfsetup/install.php
@@ -16,8 +16,6 @@ $neededFilesPattern = [
        '!^setup/.*!',
        '!^install/files/acp/images/woltlabSuite.*!',
        '!^install/files/acp/style/setup/.*!',
-       '!^install/files/font/.*!',
-       '!^install/files/icon/.*!',
        '!^install/files/lib/data/.*!',
        '!^install/files/lib/system/.*!',
        '!^install/files/lib/util/.*!',

diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php
index 1807df41479634ac5664c838538666a544b3a333..8da150f7aebc22eae8774efa265a712a9b8ed3cd 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@ -200,10 +200,6 @@ final class WCFSetup extends WCF
                     'data:image/png;base64,%s',
                     \base64_encode(\file_get_contents(TMP_DIR . 'install/files/acp/images/woltlabSuite.png'))
                 ),
-                'fontawesome-webfont.woff2' => \sprintf(
-                    'data:font/woff2;base64,%s',
-                    \base64_encode(\file_get_contents(TMP_DIR . 'install/files/font/fontawesome-webfont.woff2'))
-                ),
             ],
         ]);
     }

diff --git a/wcfsetup/setup/template/header.tpl b/wcfsetup/setup/template/header.tpl
index 9bc4a9a2d2857fcc702392cefd7d8f4dbea019b1..ac4e2b0737961fa9702838903965ba78ec4bf0ce 100644 (file)
--- a/wcfsetup/setup/template/header.tpl
+++ b/wcfsetup/setup/template/header.tpl
@@ -7,15 +7,6 @@
        <meta name="viewport" content="width=device-width, initial-scale=1">
        <link rel="stylesheet" type="text/css" media="screen" href="{$setupAssets['WCFSetup.css']}">
 
-       <style type="text/css">
-               @font-face {
-                       font-family: 'FontAwesome';
-                       src: url('{$setupAssets['fontawesome-webfont.woff2']}') format('woff2');
-                       font-weight: normal;
-                       font-style: normal;
-               }
-       </style>
-
        <style type="text/css">
                #pageHeaderContainer {
                        height: 100px;