From 39461a2e096ad9d149f134fd76cd51dd046e76bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 2 Feb 2018 12:49:56 +0100 Subject: [PATCH 1/3] Make sure theming logo css only applies when a logo is set MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/theming/css/theming.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss index 3cb8ee2584..18ddd9235d 100644 --- a/apps/theming/css/theming.scss +++ b/apps/theming/css/theming.scss @@ -91,14 +91,14 @@ } /* override styles for login screen in guest.css */ -@if variable_exists('theming-logo-mime') { +@if variable_exists('theming-logo-mime') and $theming-logo-mime != '' { #header .logo { background-image: url(#{$image-logo}); background-size: contain; } } -@if variable_exists('theming-background-mime') { +@if variable_exists('theming-background-mime') and $theming-background-mime != '' { #body-login, #firstrunwizard .firstrunwizard-header, #theming-preview { From c29bf244401efd87243346f5f17e0abe242bc37b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 2 Feb 2018 12:50:19 +0100 Subject: [PATCH 2/3] Load guest css on any guest and error page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/private/TemplateLayout.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 5e6d432c80..3acdae0e39 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -178,7 +178,9 @@ class TemplateLayout extends \OC_Template { if(\OC::$server->getSystemConfig()->getValue('installed', false) && !\OCP\Util::needUpgrade() && $pathInfo !== '' - && !preg_match('/^\/login/', $pathInfo)) { + && !preg_match('/^\/login/', $pathInfo) + && $renderAs !== 'error' && $renderAs !== 'guest' + ) { $cssFiles = self::findStylesheetFiles(\OC_Util::$styles); } else { // If we ignore the scss compiler, From 1ac352de6c047db8f9b9e58c4eec308bbccae19d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 2 Feb 2018 12:56:54 +0100 Subject: [PATCH 3/3] Add space on guest pages with custom logo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/theming/css/theming.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss index 18ddd9235d..623aad063f 100644 --- a/apps/theming/css/theming.scss +++ b/apps/theming/css/theming.scss @@ -96,6 +96,9 @@ background-image: url(#{$image-logo}); background-size: contain; } + #body-login #header .logo { + margin-bottom: 22px; + } } @if variable_exists('theming-background-mime') and $theming-background-mime != '' {