Theming update on url

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
nextcloud · Jun 20, 2018 · 8aaf2c3 · 8aaf2c3
1 parent c367cb2
commit 8aaf2c3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
@@ -94,28 +94,28 @@
 @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 {
 		margin-bottom: 22px;
 	}
 } @else {
 	#theming-preview-logo {
-		background-image: url(#{$image-logo});
+		background-image: $image-logo;
 	}
 }
 
 @if variable_exists('theming-background-mime') and $theming-background-mime != ''  {
 	#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
@@ -272,10 +272,10 @@ public function getScssVariables() {
 			'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
@@ -645,8 +645,8 @@ public function testGetScssVariables() {
 			'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',