diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-02-05 12:14:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-05 12:14:09 +0100 |
| commit | 0225ea1b9ae59182d93edcc7fc9c09a75914d56b (patch) | |
| tree | 7ac5c141945fea6953af2ab0375c4b2948e05dab | |
| parent | 30d6fd7f01e0fb47c23c3e12ca17dc2ab8d4c287 (diff) | |
| parent | 1ac352de6c047db8f9b9e58c4eec308bbccae19d (diff) | |
| download | nextcloud-server-0225ea1b9ae59182d93edcc7fc9c09a75914d56b.tar.gz nextcloud-server-0225ea1b9ae59182d93edcc7fc9c09a75914d56b.zip | |
Merge pull request #8155 from nextcloud/use-guest-css
Fix styling issues of guest pages
| -rw-r--r-- | apps/theming/css/theming.scss | 7 | ||||
| -rw-r--r-- | lib/private/TemplateLayout.php | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss index 3cb8ee2584d..623aad063f1 100644 --- a/apps/theming/css/theming.scss +++ b/apps/theming/css/theming.scss @@ -91,14 +91,17 @@ } /* 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; } + #body-login #header .logo { + margin-bottom: 22px; + } } -@if variable_exists('theming-background-mime') { +@if variable_exists('theming-background-mime') and $theming-background-mime != '' { #body-login, #firstrunwizard .firstrunwizard-header, #theming-preview { diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 5e6d432c805..3acdae0e395 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, |