diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-08-01 19:50:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-01 19:50:42 +0200 |
| commit | dbf3ca5baf51a0a94d58dc90f66270190c018ed3 (patch) | |
| tree | 3efae01d2479b68541e4a5846bd750b5ba139427 /apps/theming | |
| parent | 32e5e48b0b5effe42ccc9d40388a26d4ba26ad18 (diff) | |
| parent | ad5e98c81ad5aaeea2f49dd6cae22a92b45e4310 (diff) | |
| download | nextcloud-server-dbf3ca5baf51a0a94d58dc90f66270190c018ed3.tar.gz nextcloud-server-dbf3ca5baf51a0a94d58dc90f66270190c018ed3.zip | |
Merge pull request #682 from nextcloud/fix-theming-logo
fix missing semicolon to fix themed logo on log in page
Diffstat (limited to 'apps/theming')
| -rw-r--r-- | apps/theming/lib/Controller/ThemingController.php | 6 | ||||
| -rw-r--r-- | apps/theming/tests/Controller/ThemingControllerTest.php | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php index f788261b747..8d9869b84a7 100644 --- a/apps/theming/lib/Controller/ThemingController.php +++ b/apps/theming/lib/Controller/ThemingController.php @@ -288,10 +288,10 @@ class ThemingController extends Controller { "}\n"; $responseCss .= ' #firstrunwizard .firstrunwizard-header { - background-color: ' . $color . '; + background-color: ' . $color . '; } #firstrunwizard p a { - color: ' . $color . '; + color: ' . $color . '; } '; @@ -300,7 +300,7 @@ class ThemingController extends Controller { 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/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php index 0f42e252400..82eb8259af5 100644 --- a/apps/theming/tests/Controller/ThemingControllerTest.php +++ b/apps/theming/tests/Controller/ThemingControllerTest.php @@ -386,10 +386,10 @@ class ThemingControllerTest extends TestCase { $expectedData .= ' #firstrunwizard .firstrunwizard-header { - background-color: ' . $color . '; + background-color: ' . $color . '; } #firstrunwizard p a { - color: ' . $color . '; + color: ' . $color . '; } '; @@ -442,10 +442,10 @@ class ThemingControllerTest extends TestCase { $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"; @@ -484,7 +484,7 @@ class ThemingControllerTest extends TestCase { ->willReturn(''); $expectedData = '#header .logo {' . - 'background-image: url(\'./logo?v=0\')' . + 'background-image: url(\'./logo?v=0\');' . 'background-size: contain;' . '}' . "\n" . '#header .logo-icon {' . @@ -579,15 +579,15 @@ class ThemingControllerTest extends TestCase { "}\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 {' . @@ -652,15 +652,15 @@ class ThemingControllerTest extends TestCase { "}\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 {' . |