mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

[stable10] fix missing semicolon to fix themed logo on log in page
This commit is contained in:
Jan-Christoph Borchardt 2016-08-01 21:01:51 +02:00 committed by GitHub
parent 481418ff40 a32d9bbc6e
commit 80470093dd
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/theming/lib/controller/themingcontroller.php
View File

@ -233,10 +233,10 @@ class ThemingController extends Controller {
"}\n"; "}\n";
$responseCss .= ' $responseCss .= '
#firstrunwizard .firstrunwizard-header { #firstrunwizard .firstrunwizard-header {
background-color: ' . $color . '; background-color: ' . $color . ';
} }
#firstrunwizard p a { #firstrunwizard p a {
color: ' . $color . '; color: ' . $color . ';
} }
'; ';
@ -245,7 +245,7 @@ class ThemingController extends Controller {
if($logo !== '') { if($logo !== '') {
$responseCss .= sprintf( $responseCss .= sprintf(
'#header .logo {' . '#header .logo {' .
'background-image: url(\'./logo?v='.$cacheBusterValue.'\')' . 'background-image: url(\'./logo?v='.$cacheBusterValue.'\');' .
'background-size: contain;' . 'background-size: contain;' .
'}' . "\n" . '}' . "\n" .
'#header .logo-icon {' . '#header .logo-icon {' .

22
apps/theming/tests/lib/controller/ThemingControllerTest.php
View File

@ -349,10 +349,10 @@ class ThemingControllerTest extends TestCase {
$expectedData .= ' $expectedData .= '
#firstrunwizard .firstrunwizard-header { #firstrunwizard .firstrunwizard-header {
background-color: ' . $color . '; background-color: ' . $color . ';
} }
#firstrunwizard p a { #firstrunwizard p a {
color: ' . $color . '; color: ' . $color . ';
} }
'; ';
@ -404,10 +404,10 @@ class ThemingControllerTest extends TestCase {
$expectedData .= ' $expectedData .= '
#firstrunwizard .firstrunwizard-header { #firstrunwizard .firstrunwizard-header {
background-color: ' . $color . '; background-color: ' . $color . ';
} }
#firstrunwizard p a { #firstrunwizard p a {
color: ' . $color . '; color: ' . $color . ';
} }
'; ';
$expectedData .= '#header .header-appname, #expandDisplayName { color: #000000; }' . "\n"; $expectedData .= '#header .header-appname, #expandDisplayName { color: #000000; }' . "\n";
@ -445,7 +445,7 @@ class ThemingControllerTest extends TestCase {
->willReturn(''); ->willReturn('');
$expectedData = '#header .logo {' . $expectedData = '#header .logo {' .
'background-image: url(\'./logo?v=0\')' . 'background-image: url(\'./logo?v=0\');' .
'background-size: contain;' . 'background-size: contain;' .
'}' . "\n" . '}' . "\n" .
'#header .logo-icon {' . '#header .logo-icon {' .
@ -538,15 +538,15 @@ class ThemingControllerTest extends TestCase {
"}\n"; "}\n";
$expectedData .= ' $expectedData .= '
#firstrunwizard .firstrunwizard-header { #firstrunwizard .firstrunwizard-header {
background-color: ' . $color . '; background-color: ' . $color . ';
} }
#firstrunwizard p a { #firstrunwizard p a {
color: ' . $color . '; color: ' . $color . ';
} }
'; ';
$expectedData .= sprintf( $expectedData .= sprintf(
'#header .logo {' . '#header .logo {' .
'background-image: url(\'./logo?v=0\')' . 'background-image: url(\'./logo?v=0\');' .
'background-size: contain;' . 'background-size: contain;' .
'}' . "\n" . '}' . "\n" .
'#header .logo-icon {' . '#header .logo-icon {' .
@ -610,15 +610,15 @@ class ThemingControllerTest extends TestCase {
"}\n"; "}\n";
$expectedData .= ' $expectedData .= '
#firstrunwizard .firstrunwizard-header { #firstrunwizard .firstrunwizard-header {
background-color: ' . $color . '; background-color: ' . $color . ';
} }
#firstrunwizard p a { #firstrunwizard p a {
color: ' . $color . '; color: ' . $color . ';
} }
'; ';
$expectedData .= sprintf( $expectedData .= sprintf(
'#header .logo {' . '#header .logo {' .
'background-image: url(\'./logo?v=0\')' . 'background-image: url(\'./logo?v=0\');' .
'background-size: contain;' . 'background-size: contain;' .
'}' . "\n" . '}' . "\n" .
'#header .logo-icon {' . '#header .logo-icon {' .