Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>tags/v14.0.0beta1
@@ -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; | |||
} | |||
} |
@@ -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) { |
@@ -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', |