Merge pull request #1971 from nextcloud/fix-checkbox-glitch

Fix checkbox left margin glitch
nextcloud · Nov 2, 2016 · 3bdec28 · 3bdec28
2 parents e6b52ef + bc5268b
commit 3bdec28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
@@ -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

diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php
@@ -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
@@ -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
 		);
@@ -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
@@ -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
 		);