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

Theming update on url 

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2018-06-03 11:26:06 +02:00
parent c367cb20fa
commit 8aaf2c3272
No known key found for this signature in database
GPG Key ID: 60C25B8C072916CF
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,7 @@
@if variable_exists('theming-logo-mime') and $theming-logo-mime != '' {
#theming-preview-logo,
#header .logo {
background-image: url(#{$image-logo});
background-image: $image-logo;
background-size: contain;
}
#body-login #header .logo {
@ -102,7 +102,7 @@
}
} @else {
#theming-preview-logo {
background-image: url(#{$image-logo});
background-image: $image-logo;
}
}
@ -110,12 +110,12 @@
#body-login,
#firstrunwizard .firstrunwizard-header,
#theming-preview {
background-image: url(#{$image-login-background});
background-image: $image-login-background;
background-color: $color-primary;
}
} @else {
#theming-preview {
background-image: url(#{$image-login-background});
background-image: $image-login-background;
background-color: $color-primary;
}
}

4
apps/theming/lib/ThemingDefaults.php
View File

@ -272,10 +272,10 @@ class ThemingDefaults extends \OC_Defaults {
'theming-favicon-mime' => "'" . $this->config->getAppValue('theming', 'faviconMime') . "'"
];
$variables['image-logo'] = "'".$this->imageManager->getImageUrl('logo')."'";
$variables['image-logo'] = "url('".$this->imageManager->getImageUrl('logo')."')";
$variables['image-logoheader'] = "'".$this->imageManager->getImageUrl('logoheader')."'";
$variables['image-favicon'] = "'".$this->imageManager->getImageUrl('favicon')."'";
$variables['image-login-background'] = "'".$this->imageManager->getImageUrl('background')."'";
$variables['image-login-background'] = "url('".$this->imageManager->getImageUrl('background')."')";
$variables['image-login-plain'] = 'false';
if ($this->config->getAppValue('theming', 'color', null) !== null) {

4
apps/theming/tests/ThemingDefaultsTest.php
View File

@ -645,8 +645,8 @@ class ThemingDefaultsTest extends TestCase {
'theming-cachebuster' => '\'0\'',
'theming-logo-mime' => '\'jpeg\'',
'theming-background-mime' => '\'jpeg\'',
'image-logo' => "'custom-logo?v=0'",
'image-login-background' => "'custom-background?v=0'",
'image-logo' => "url('custom-logo?v=0')",
'image-login-background' => "url('custom-background?v=0')",
'color-primary' => $this->defaults->getColorPrimary(),
'color-primary-text' => '#ffffff',
'image-login-plain' => 'false',