diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php index 20560411a..f88c77f26 100644 --- a/admin/code/LeftAndMain.php +++ b/admin/code/LeftAndMain.php @@ -1158,25 +1158,7 @@ class LeftAndMain extends Controller { self::$application_logo_style = $logoStyle; self::$application_logo_text = ''; } - - /** - * The height of the image should be around 164px to avoid the overlaping between the image and loading animation graphic. - * If the given image's height is significantly larger or smaller, adjust the loading animation's top offset in - * positionLoadingSpinner() in LeftAndMain.js - */ - protected static $loading_image = 'sapphire/admin/images/logo.gif'; - - /** - * Set the image shown when the CMS is loading. - */ - static function set_loading_image($loadingImage) { - self::$loading_image = $loadingImage; - } - - function LoadingImage() { - return self::$loading_image; - } - + /** * Combines an optional background image and additional CSS styles, * set through {@link setLogo()}. diff --git a/admin/css/layout.css b/admin/css/layout.css index 332921502..eab551f06 100644 --- a/admin/css/layout.css +++ b/admin/css/layout.css @@ -19,6 +19,7 @@ } .ss-loading-screen .loading-logo { + background-url: url(../images/logo.gif); background-repeat: no-repeat; background-color: transparent; background-position: 50% 50%; diff --git a/admin/templates/LeftAndMain.ss b/admin/templates/LeftAndMain.ss index d94c97ba9..b54cb335d 100644 --- a/admin/templates/LeftAndMain.ss +++ b/admin/templates/LeftAndMain.ss @@ -9,7 +9,7 @@
-