summaryrefslogtreecommitdiffstats
path: root/apps/theming
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2016-08-01 08:39:40 +0200
committerJan-Christoph Borchardt <hey@jancborchardt.net>2016-08-01 09:57:05 +0200
commitad5e98c81ad5aaeea2f49dd6cae22a92b45e4310 (patch)
tree2611186d0e0e2d0e16a009bc50239b0e6a51b0e3 /apps/theming
parent3b386af295fdd5ea986edd4447637043f69b4c38 (diff)
downloadnextcloud-server-ad5e98c81ad5aaeea2f49dd6cae22a92b45e4310.tar.gz
nextcloud-server-ad5e98c81ad5aaeea2f49dd6cae22a92b45e4310.zip
fix missing semicolon to fix themed logo on log in page
Diffstat (limited to 'apps/theming')
-rw-r--r--apps/theming/lib/Controller/ThemingController.php6
-rw-r--r--apps/theming/tests/Controller/ThemingControllerTest.php22
2 files changed, 14 insertions, 14 deletions
diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
index 55391619f3c..24865cc2c6e 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 933faf8a0a1..c5a947cc8b7 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 {' .