From ad5e98c81ad5aaeea2f49dd6cae22a92b45e4310 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 1 Aug 2016 08:39:40 +0200 Subject: [PATCH] fix missing semicolon to fix themed logo on log in page --- .../lib/Controller/ThemingController.php | 6 ++--- .../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 55391619f3..24865cc2c6 100644 --- a/apps/theming/lib/Controller/ThemingController.php +++ b/apps/theming/lib/Controller/ThemingController.php @@ -244,10 +244,10 @@ class ThemingController extends Controller { "}\n"; $responseCss .= ' #firstrunwizard .firstrunwizard-header { - background-color: ' . $color . '; + background-color: ' . $color . '; } #firstrunwizard p a { - color: ' . $color . '; + color: ' . $color . '; } '; @@ -256,7 +256,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 933faf8a0a..c5a947cc8b 100644 --- a/apps/theming/tests/Controller/ThemingControllerTest.php +++ b/apps/theming/tests/Controller/ThemingControllerTest.php @@ -365,10 +365,10 @@ class ThemingControllerTest extends TestCase { $expectedData .= ' #firstrunwizard .firstrunwizard-header { - background-color: ' . $color . '; + background-color: ' . $color . '; } #firstrunwizard p a { - color: ' . $color . '; + color: ' . $color . '; } '; @@ -421,10 +421,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"; @@ -463,7 +463,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 {' . @@ -558,15 +558,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 {' . @@ -631,15 +631,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 {' .