Skip to content
Snippets Groups Projects
Unverified Commit bc5268bd authored by John Molakvoæ's avatar John Molakvoæ Committed by Morris Jobke
Browse files

Fix #1782


Fix checkbox left margin glitch
Fix tests
fix unit tests

Signed-off-by: default avatarMorris Jobke <hey@morrisjobke.de>
parent ffebc050
No related branches found
No related tags found
No related merge requests found
...@@ -319,7 +319,7 @@ class ThemingController extends Controller { ...@@ -319,7 +319,7 @@ class ThemingController extends Controller {
$responseCss .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . $responseCss .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' .
'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' . 'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' .
'background-color: %s; background-position: center center; background-size:contain;' . '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", "}\n",
\OC::$WEBROOT, \OC::$WEBROOT,
$elementColor $elementColor
......
...@@ -428,7 +428,7 @@ class ThemingControllerTest extends TestCase { ...@@ -428,7 +428,7 @@ class ThemingControllerTest extends TestCase {
$expectedData .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . $expectedData .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' .
'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' . 'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' .
'background-color: %s; background-position: center center; background-size:contain;' . '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", "}\n",
\OC::$WEBROOT, \OC::$WEBROOT,
$color $color
...@@ -517,7 +517,7 @@ class ThemingControllerTest extends TestCase { ...@@ -517,7 +517,7 @@ class ThemingControllerTest extends TestCase {
$expectedData .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . $expectedData .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' .
'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' . 'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' .
'background-color: #555555; background-position: center center; background-size:contain;' . '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", "}\n",
\OC::$WEBROOT \OC::$WEBROOT
); );
...@@ -691,7 +691,7 @@ class ThemingControllerTest extends TestCase { ...@@ -691,7 +691,7 @@ class ThemingControllerTest extends TestCase {
$expectedData .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . $expectedData .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' .
'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' . 'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' .
'background-color: %s; background-position: center center; background-size:contain;' . '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", "}\n",
\OC::$WEBROOT, \OC::$WEBROOT,
$color $color
...@@ -797,7 +797,7 @@ class ThemingControllerTest extends TestCase { ...@@ -797,7 +797,7 @@ class ThemingControllerTest extends TestCase {
$expectedData .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' . $expectedData .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' .
'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' . 'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' .
'background-color: #555555; background-position: center center; background-size:contain;' . '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", "}\n",
\OC::$WEBROOT \OC::$WEBROOT
); );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment