Merge pull request #6303 from nextcloud/background-image

Adjust background image to the one used on the website

3 files changed, 3 insertions, 4 deletions

diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index 252d009289e..339bf8a58b9 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -60,8 +60,7 @@
 }
 
 input.primary {
-	background-color: nc-lighten($color-primary, .9);
-	border: 1px solid $color-primary;
+	background-color: $color-primary;
 	color: $color-primary-text;
 }
 
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php
index dff24ee7960..b10dc4b7ea8 100644
--- a/apps/theming/lib/ThemingDefaults.php
+++ b/apps/theming/lib/ThemingDefaults.php
@@ -183,7 +183,7 @@ class ThemingDefaults extends \OC_Defaults {
 		$cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');
 
 		if(!$backgroundLogo || !$backgroundExists) {
-			return $this->urlGenerator->imagePath('core','background.jpg') . '?v=' . $cacheBusterCounter;
+			return $this->urlGenerator->imagePath('core','background.png') . '?v=' . $cacheBusterCounter;
 		}
 
 		return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground') . '?v=' . $cacheBusterCounter;
diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php
index 057229483e9..cb827773470 100644
--- a/apps/theming/tests/ThemingDefaultsTest.php
+++ b/apps/theming/tests/ThemingDefaultsTest.php
@@ -400,7 +400,7 @@ class ThemingDefaultsTest extends TestCase {
 			->willThrowException(new \Exception());
 		$this->urlGenerator->expects($this->once())
 			->method('imagePath')
-			->with('core', 'background.jpg')
+			->with('core', 'background.png')
 			->willReturn('core-background');
 		$this->assertEquals('core-background?v=0', $this->template->getBackground());
 	}