mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8286 from nextcloud/stable13-8155 

[13] Fix styling issues of guest pages #8155
This commit is contained in:
John Molakvoæ 2018-02-10 00:04:40 +01:00 committed by GitHub
parent 9c9c438c8b ef571d69f3
commit 3f91eaedfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/theming/css/theming.scss
View File

@ -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 {

4
lib/private/TemplateLayout.php
View File

@ -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,