From a32d9bbc6e43d5ec8e887afddb42d5c62d141719 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 ++--- .../lib/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 61bc0b86bf4..6f8af0bb78c 100644 --- a/apps/theming/lib/controller/themingcontroller.php +++ b/apps/theming/lib/controller/themingcontroller.php @@ -233,10 +233,10 @@ class ThemingController extends Controller { "}\n"; $responseCss .= ' #firstrunwizard .firstrunwizard-header { - background-color: ' . $color . '; + background-color: ' . $color . '; } #firstrunwizard p a { - color: ' . $color . '; + color: ' . $color . '; } '; @@ -245,7 +245,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/lib/controller/ThemingControllerTest.php b/apps/theming/tests/lib/controller/ThemingControllerTest.php index 0cbf125d8fd..c9b55001f8c 100644 --- a/apps/theming/tests/lib/controller/ThemingControllerTest.php +++ b/apps/theming/tests/lib/controller/ThemingControllerTest.php @@ -349,10 +349,10 @@ class ThemingControllerTest extends TestCase { $expectedData .= ' #firstrunwizard .firstrunwizard-header { - background-color: ' . $color . '; + background-color: ' . $color . '; } #firstrunwizard p a { - color: ' . $color . '; + color: ' . $color . '; } '; @@ -404,10 +404,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"; @@ -445,7 +445,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 {' . @@ -538,15 +538,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 {' . @@ -610,15 +610,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 {' . -- 2.39.5