Merge pull request #683 from nextcloud/stable10-fix-theming-logo

[stable10] fix missing semicolon to fix themed logo on log in page
nextcloud · Aug 1, 2016 · 8047009 · 8047009
2 parents 481418f + a32d9bb
commit 8047009
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/apps/theming/lib/controller/themingcontroller.php b/apps/theming/lib/controller/themingcontroller.php
@@ -233,10 +233,10 @@ public function getStylesheet() {
 				"}\n";
 			$responseCss .= '
 				#firstrunwizard .firstrunwizard-header {
-				    background-color: ' . $color . ';
+					background-color: ' . $color . ';
 				}
 				#firstrunwizard p a {
-				    color: ' . $color . ';
+					color: ' . $color . ';
 				}
 				';
 
@@ -245,7 +245,7 @@ public function getStylesheet() {
 		if($logo !== '') {
 			$responseCss .= sprintf(
 				'#header .logo {' .
-				'background-image: url(\'./logo?v='.$cacheBusterValue.'\')' .
+				'background-image: url(\'./logo?v='.$cacheBusterValue.'\');' .
 				'background-size: contain;' .
 				'}' . "\n" .
 				'#header .logo-icon {' .

diff --git a/apps/theming/tests/lib/controller/ThemingControllerTest.php b/apps/theming/tests/lib/controller/ThemingControllerTest.php
@@ -349,10 +349,10 @@ public function testGetStylesheetWithOnlyColor() {
 
 		$expectedData .= '
 				#firstrunwizard .firstrunwizard-header {
-				    background-color: ' . $color . ';
+					background-color: ' . $color . ';
 				}
 				#firstrunwizard p a {
-				    color: ' . $color . ';
+					color: ' . $color . ';
 				}
 				';
 
@@ -404,10 +404,10 @@ public function testGetStylesheetWithOnlyColorInvert() {
 
 		$expectedData .= '
 				#firstrunwizard .firstrunwizard-header {
-				    background-color: ' . $color . ';
+					background-color: ' . $color . ';
 				}
 				#firstrunwizard p a {
-				    color: ' . $color . ';
+					color: ' . $color . ';
 				}
 				';
 		$expectedData .= '#header .header-appname, #expandDisplayName { color: #000000; }' . "\n";
@@ -445,7 +445,7 @@ public function testGetStylesheetWithOnlyHeaderLogo() {
 			->willReturn('');
 
 		$expectedData = '#header .logo {' .
-			'background-image: url(\'./logo?v=0\')' .
+			'background-image: url(\'./logo?v=0\');' .
 			'background-size: contain;' .
 			'}' . "\n" .
 			'#header .logo-icon {' .
@@ -538,15 +538,15 @@ public function testGetStylesheetWithAllCombined() {
 			"}\n";
 		$expectedData .= '
 				#firstrunwizard .firstrunwizard-header {
-				    background-color: ' . $color . ';
+					background-color: ' . $color . ';
 				}
 				#firstrunwizard p a {
-				    color: ' . $color . ';
+					color: ' . $color . ';
 				}
 				';
 		$expectedData .= sprintf(
 			'#header .logo {' .
-			'background-image: url(\'./logo?v=0\')' .
+			'background-image: url(\'./logo?v=0\');' .
 			'background-size: contain;' .
 			'}' . "\n" .
 			'#header .logo-icon {' .
@@ -610,15 +610,15 @@ public function testGetStylesheetWithAllCombinedInverted() {
 			"}\n";
 		$expectedData .= '
 				#firstrunwizard .firstrunwizard-header {
-				    background-color: ' . $color . ';
+					background-color: ' . $color . ';
 				}
 				#firstrunwizard p a {
-				    color: ' . $color . ';
+					color: ' . $color . ';
 				}
 				';
 		$expectedData .= sprintf(
 			'#header .logo {' .
-			'background-image: url(\'./logo?v=0\')' .
+			'background-image: url(\'./logo?v=0\');' .
 			'background-size: contain;' .
 			'}' . "\n" .
 			'#header .logo-icon {' .