[BUGFIX] Prefix font awesome icon path for admin_panel.css

Font Awesome icons are prefixed with #TSFE_ADMIN_PANEL_FORM to
prevent issues with CSS from the website that uses Font Awesome too.

Resolves: #68591
Releases: master
Change-Id: I7e5b7f80c9bcf1508f938fb38d74f643dabd2b9a
Reviewed-on: http://review.typo3.org/42058
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>

diff --git a/typo3/sysext/frontend/Classes/Http/RequestHandler.php b/typo3/sysext/frontend/Classes/Http/RequestHandler.php
index ced52d9..bd140b4 100644 (file)
--- a/typo3/sysext/frontend/Classes/Http/RequestHandler.php
+++ b/typo3/sysext/frontend/Classes/Http/RequestHandler.php
@@ -267,6 +267,7 @@ class RequestHandler implements RequestHandlerInterface {
                // Admin panel
                if ($this->controller->isBackendUserLoggedIn() && $GLOBALS['BE_USER'] instanceof FrontendBackendUserAuthentication) {
                        if ($GLOBALS['BE_USER']->extAdmEnabled) {
+                               // Style sheet is also used for frontend editing.
                                $this->controller->content = str_ireplace('</head>', $GLOBALS['BE_USER']->adminPanel->getAdminPanelHeaderData() . '</head>', $this->controller->content);
                        }
                        if ($GLOBALS['BE_USER']->isAdminPanelVisible()) {

diff --git a/typo3/sysext/t3skin/stylesheets/standalone/admin_panel.css b/typo3/sysext/t3skin/stylesheets/standalone/admin_panel.css
index 2014d23..4fccb3f 100644 (file)
--- a/typo3/sysext/t3skin/stylesheets/standalone/admin_panel.css
+++ b/typo3/sysext/t3skin/stylesheets/standalone/admin_panel.css
@@ -15,7 +15,12 @@
   font-weight: normal;
   font-style: normal;
 }
-.fa, .fa:before {
+
+/*!
+ * Font Awesome icons are prefixed with #TSFE_ADMIN_PANEL_FORM to prevent issues with
+ * CSS from the website that uses Font Awesome too.
+ */
+#TSFE_ADMIN_PANEL_FORM .fa, .fa:before {
   display: inline-block;
   font: normal normal normal 14px/1 FontAwesome;
   font-size: 15px;
@@ -24,55 +29,55 @@
   -moz-osx-font-smoothing: grayscale;
   transform: translate(0, 0);
 }
-.fa-pencil:before {
+#TSFE_ADMIN_PANEL_FORM .fa-pencil:before {
   content: "\f040";
 }
-.fa-angle-up:before {
+#TSFE_ADMIN_PANEL_FORM .fa-angle-up:before {
   content: "\f106";
 }
-.fa-angle-down:before {
+#TSFE_ADMIN_PANEL_FORM .fa-angle-down:before {
   content: "\f107";
 }
-.fa-toggle-off:before {
+#TSFE_ADMIN_PANEL_FORM .fa-toggle-off:before {
   content: "\f204";
 }
-.fa-toggle-on:before {
+#TSFE_ADMIN_PANEL_FORM .fa-toggle-on:before {
   content: "\f205";
 }
-.fa-google-plus-square:before {
+#TSFE_ADMIN_PANEL_FORM .fa-google-plus-square:before {
   content: "\f0d4";
 }
-.fa-trash:before {
+#TSFE_ADMIN_PANEL_FORM .fa-trash:before {
   content: "\f1f8";
 }
-.fa-history:before {
+#TSFE_ADMIN_PANEL_FORM .fa-history:before {
   content: "\f1da";
 }
-.fa-list-alt:before {
+#TSFE_ADMIN_PANEL_FORM .fa-list-alt:before {
   content: "\f022";
 }
-.fa-plus-square:before {
+#TSFE_ADMIN_PANEL_FORM .fa-plus-square:before {
   content: "\f0fe";
 }
-.fa-arrows:before {
+#TSFE_ADMIN_PANEL_FORM .fa-arrows:before {
   content: "\f047";
 }
-.fa-exclamation-circle:before {
+#TSFE_ADMIN_PANEL_FORM .fa-exclamation-circle:before {
     content: "\f06a";
 }
-.fa-exclamation-triangle:before {
+#TSFE_ADMIN_PANEL_FORM .fa-exclamation-triangle:before {
     content: "\f071";
 }
-.fa-info-circle:before {
+#TSFE_ADMIN_PANEL_FORM .fa-info-circle:before {
     content: "\f05a";
 }
-.fa-caret-down:before {
+#TSFE_ADMIN_PANEL_FORM .fa-caret-down:before {
     content: "\f0d7";
 }
-.fa-caret-up:before {
+#TSFE_ADMIN_PANEL_FORM .fa-caret-up:before {
     content: "\f0d8";
 }
-.fa-bolt:before {
+#TSFE_ADMIN_PANEL_FORM .fa-bolt:before {
        content: "\f0e7";
 }