diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-06-03 11:26:06 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-06-20 19:17:06 +0200 |
| commit | 8aaf2c32729fcd0302f79546f396a07398f0d724 (patch) | |
| tree | aa4468e6e042aeeff786fe9403049b10345e30e8 /apps/theming | |
| parent | c367cb20fa126042df9f6a930152ee15c0abeb46 (diff) | |
| download | nextcloud-server-8aaf2c32729fcd0302f79546f396a07398f0d724.tar.gz nextcloud-server-8aaf2c32729fcd0302f79546f396a07398f0d724.zip | |
Theming update on url
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'apps/theming')
| -rw-r--r-- | apps/theming/css/theming.scss | 8 | ||||
| -rw-r--r-- | apps/theming/lib/ThemingDefaults.php | 4 | ||||
| -rw-r--r-- | apps/theming/tests/ThemingDefaultsTest.php | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss index 6b0566039d2..4a32458d8a8 100644 --- a/apps/theming/css/theming.scss +++ b/apps/theming/css/theming.scss @@ -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; } } diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php index d29eb69873f..72286ece4b8 100644 --- a/apps/theming/lib/ThemingDefaults.php +++ b/apps/theming/lib/ThemingDefaults.php @@ -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) { diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php index ceaf2cc19d5..87b2003ded2 100644 --- a/apps/theming/tests/ThemingDefaultsTest.php +++ b/apps/theming/tests/ThemingDefaultsTest.php @@ -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', |