open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #1782

Browse Source 
Fix checkbox left margin glitch
Fix tests
fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
pull/1971/head
John Molakvoæ 8 years ago committed by Morris Jobke
parent ffebc050d0
commit bc5268bdc8
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
2 changed files with 5 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      apps/theming/lib/Controller/ThemingController.php
  2. 8
      apps/theming/tests/Controller/ThemingControllerTest.php

2
apps/theming/lib/Controller/ThemingController.php
Unescape View File

@ -319,7 +319,7 @@ class ThemingController extends Controller {
$responseCss .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' .
'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' .
'background-color: %s; background-position: center center; background-size:contain;' .
'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' .
'width:12px; height:12px; padding:0; margin:2px 6px 6px 9px; border-radius:1px;' .
"}\n",
\OC::$WEBROOT,
$elementColor

8
apps/theming/tests/Controller/ThemingControllerTest.php
Unescape View File

@ -428,7 +428,7 @@ class ThemingControllerTest extends TestCase {
$expectedData .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' .
'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' .
'background-color: %s; background-position: center center; background-size:contain;' .
'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' .
'width:12px; height:12px; padding:0; margin:2px 6px 6px 9px; border-radius:1px;' .
"}\n",
\OC::$WEBROOT,
$color
@ -517,7 +517,7 @@ class ThemingControllerTest extends TestCase {
$expectedData .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' .
'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' .
'background-color: #555555; background-position: center center; background-size:contain;' .
'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' .
'width:12px; height:12px; padding:0; margin:2px 6px 6px 9px; border-radius:1px;' .
"}\n",
\OC::$WEBROOT
);
@ -691,7 +691,7 @@ class ThemingControllerTest extends TestCase {
$expectedData .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' .
'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' .
'background-color: %s; background-position: center center; background-size:contain;' .
'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' .
'width:12px; height:12px; padding:0; margin:2px 6px 6px 9px; border-radius:1px;' .
"}\n",
\OC::$WEBROOT,
$color
@ -797,7 +797,7 @@ class ThemingControllerTest extends TestCase {
$expectedData .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' .
'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' .
'background-color: #555555; background-position: center center; background-size:contain;' .
'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' .
'width:12px; height:12px; padding:0; margin:2px 6px 6px 9px; border-radius:1px;' .
"}\n",
\OC::$WEBROOT
);

Write Preview
Loading…
Cancel
Save