Revert "Fix #1782"

This reverts commit bc5268bdc84c9c9f302914ebb1b5304b614dfc2e.

Signed-off-by: Julius Haertl <jus@bitgrid.net>

diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
index f274d2458873e64491a95dba4019fc5cc8ff190a..09b4a14f2b00105da7e0831d7d74acca45f92ed9 100644 (file)
--- a/apps/theming/lib/Controller/ThemingController.php
+++ b/apps/theming/lib/Controller/ThemingController.php
@@ -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 9px; border-radius:1px;' .
+                               'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' .
                                "}\n",
                                \OC::$WEBROOT,
                                $elementColor

diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php
index 4325e1988b2a880d7547ecd1a1acb0a6e208b07d..d9d5005e25f5158415d76c37a5e8e5538c0d98e2 100644 (file)
--- a/apps/theming/tests/Controller/ThemingControllerTest.php
+++ b/apps/theming/tests/Controller/ThemingControllerTest.php
@@ -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 9px; border-radius:1px;' .
+                       'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; 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 9px; border-radius:1px;' .
+                       'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; 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 9px; border-radius:1px;' .
+                       'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; 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 9px; border-radius:1px;' .
+                       'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' .
                        "}\n",
                        \OC::$WEBROOT
                );