Merge pull request #6303 from nextcloud/background-image

Adjust background image to the one used on the website

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;
 }
 

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;

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());
 	}

core/css/guest.css

@@ -23,7 +23,7 @@ body {
 	color: #000;
 	text-align: center;
 	background-color: #0082c9;
-	background-image: url('../img/background.jpg?v=1');
+	background-image: url('../img/background.png?v=2');
 	background-position: 50% 50%;
 	background-repeat: no-repeat;
 	background-size: cover;
@@ -213,8 +213,8 @@ input.update-continue {
 }
 input.primary,
 button.primary {
-	border: 1px solid #0082c9;
-	background-color: #00a2e9;
+	border: 1px solid #fff;
+	background-color: #0082c9;
 	color: #fff;
 }
 

core/css/inputs.scss

@@ -66,8 +66,8 @@ textarea,
 	}
 	/* Primary action button, use sparingly */
 	&.primary {
-		border: 1px solid $color-primary;
-		background-color: rgba($color-primary, .7);
+		border: 1px solid #fff;
+		background-color: $color-primary;
 		color: $color-primary-text;
 		cursor: pointer;
 		&:not(:disabled) {

core/css/styles.scss

@@ -90,7 +90,7 @@ body {
 #body-login {
 	text-align: center;
 	background-color: $color-primary;
-	background-image: url('../img/background.jpg?v=1');
+	background-image: url('../img/background.png?v=2');
 	background-position: 50% 50%;
 	background-repeat: no-repeat;
 	background-size: cover;

core/css/variables.scss

@@ -15,8 +15,8 @@ $color-success: #46ba61;
 }
 
 $image-logo: '../img/logo-icon.svg?v=1';
-$image-login-background: '../img/background.jpg?v=1';
+$image-login-background: '../img/background.png?v=2';
 
 $color-loading: #969696;
 $color-loading-dark: #bbbbbb;
-$color-box-shadow: rgba(nc-lighten($color-main-text, 20%), 0.75);
+$color-box-shadow: rgba(nc-lighten($color-main-text, 20%), 0.75);