Skip to content

Commit

Permalink
Fix #1782
Browse files Browse the repository at this point in the history
Fix checkbox left margin glitch
Fix tests
fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
  • Loading branch information
skjnldsv authored and MorrisJobke committed Nov 2, 2016
1 parent ffebc05 commit bc5268b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion apps/theming/lib/Controller/ThemingController.php
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ public function getStylesheet() {
$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
Expand Down
8 changes: 4 additions & 4 deletions apps/theming/tests/Controller/ThemingControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ public function testGetStylesheetWithOnlyColor() {
$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
Expand Down Expand Up @@ -517,7 +517,7 @@ public function testGetStylesheetWithOnlyColorInvert() {
$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
);
Expand Down Expand Up @@ -691,7 +691,7 @@ public function testGetStylesheetWithAllCombined() {
$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
Expand Down Expand Up @@ -797,7 +797,7 @@ public function testGetStylesheetWithAllCombinedInverted() {
$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
);
Expand Down

0 comments on commit bc5268b

Please sign in to comment.