diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php index f88c77f26..1108bd008 100644 --- a/admin/code/LeftAndMain.php +++ b/admin/code/LeftAndMain.php @@ -1137,39 +1137,16 @@ class LeftAndMain extends Controller { * @var unknown_type */ static $application_logo = 'sapphire/admin/images/mainmenu/logo.gif'; - - /** - * The application logo style. Customisable by calling - * LeftAndMain::setLogo() - the second parameter. - * - * @var String - */ - static $application_logo_style = ''; /** * Set the CMS application logo. * * @param String $logo Relative path to the logo - * @param String $logoStyle Custom CSS styles for the logo - * e.g. "border: 1px solid red; padding: 5px;" */ - static function setLogo($logo, $logoStyle) { + static function setLogo($logo) { self::$application_logo = $logo; - self::$application_logo_style = $logoStyle; self::$application_logo_text = ''; } - - /** - * Combines an optional background image and additional CSS styles, - * set through {@link setLogo()}. - * - * @return String CSS attribute - */ - function LogoStyle() { - $attr = self::$application_logo_style; - if(self::$application_logo) $attr .= "background: url(" . self::$application_logo . ") no-repeat; "; - return $attr; - } /** * Return the base directory of the tiny_mce codebase diff --git a/admin/templates/Includes/CMSTopMenu.ss b/admin/templates/Includes/CMSTopMenu.ss index 35fbd5c13..8e6064231 100644 --- a/admin/templates/Includes/CMSTopMenu.ss +++ b/admin/templates/Includes/CMSTopMenu.ss @@ -1,4 +1,4 @@ -