Remove unnecessary CSS rule, fix unit tests

Signed-off-by: Matthias Becker <becker.matthias@gmail.com>
nextcloud · Nov 22, 2016 · f52e581 · f52e581
1 parent 56a6a80
commit f52e581
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
@@ -349,7 +349,6 @@ public function getStylesheet() {
 				"}\n";
 
 			$responseCss .= 'input[type="text"]:focus, input[type="password"]:focus, input[type="search"]:focus, input[type="number"]:focus, input[type="email"]:focus, input[type="tel"]:focus, input[type="url"]:focus, input[type="time"]:focus, input[type="date"]:focus, textarea:focus, select:focus, button:focus, .button:focus, input[type="submit"]:focus, input[type="button"]:focus, #quota:focus, .pager li a:focus { '.
-							'	color: #333; '.
 							'	border: 1px solid ' . $color . ";" .
 							"}\n";
 

diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php
@@ -456,6 +456,15 @@ public function testGetStylesheetWithOnlyColor() {
 			'opacity: 0.4;' .
 			'color: #ffffff;'.
 			"}\n";
+
+		$expectedData .= 'input[type="text"]:focus, input[type="password"]:focus, input[type="search"]:focus, input[type="number"]:focus, input[type="email"]:focus, input[type="tel"]:focus, input[type="url"]:focus, input[type="time"]:focus, input[type="date"]:focus, textarea:focus, select:focus, button:focus, .button:focus, input[type="submit"]:focus, input[type="button"]:focus, #quota:focus, .pager li a:focus { '.
+			'	border: 1px solid ' . $color . ";" .
+			"}\n";
+
+		$expectedData .= 'input[type="submit"]:focus, input[type="button"]:focus, select:focus, button:focus, .button:focus {' .
+			' color: ' . $color. ';'.
+			"}\n";
+
 		$expectedData .= '.ui-widget-header { border: 1px solid ' . $color . '; background: '. $color . '; color: #ffffff;' . "}\n";
 		$expectedData .= '.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active {' .
 			'border: 1px solid ' . $color . ';' .
@@ -544,6 +553,13 @@ public function testGetStylesheetWithOnlyColorInvert() {
 			'opacity: 0.4;' .
 			'color: #000000;'.
 			"}\n";
+		$expectedData .= 'input[type="text"]:focus, input[type="password"]:focus, input[type="search"]:focus, input[type="number"]:focus, input[type="email"]:focus, input[type="tel"]:focus, input[type="url"]:focus, input[type="time"]:focus, input[type="date"]:focus, textarea:focus, select:focus, button:focus, .button:focus, input[type="submit"]:focus, input[type="button"]:focus, #quota:focus, .pager li a:focus { '.
+			'	border: 1px solid ' . $color . ";" .
+			"}\n";
+
+		$expectedData .= 'input[type="submit"]:focus, input[type="button"]:focus, select:focus, button:focus, .button:focus {' .
+			' color: ' . $color. ';'.
+			"}\n";
 		$expectedData .= '.ui-widget-header { border: 1px solid ' . $color . '; background: '. $color . '; color: #ffffff;' . "}\n";
 		$expectedData .= '.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active {' .
 			'border: 1px solid ' . $color . ';' .
@@ -719,6 +735,13 @@ public function testGetStylesheetWithAllCombined() {
 			'opacity: 0.4;' .
 			'color: #ffffff;'.
 			"}\n";
+		$expectedData .= 'input[type="text"]:focus, input[type="password"]:focus, input[type="search"]:focus, input[type="number"]:focus, input[type="email"]:focus, input[type="tel"]:focus, input[type="url"]:focus, input[type="time"]:focus, input[type="date"]:focus, textarea:focus, select:focus, button:focus, .button:focus, input[type="submit"]:focus, input[type="button"]:focus, #quota:focus, .pager li a:focus { '.
+			'	border: 1px solid ' . $color . ";" .
+			"}\n";
+
+		$expectedData .= 'input[type="submit"]:focus, input[type="button"]:focus, select:focus, button:focus, .button:focus {' .
+			' color: ' . $color. ';'.
+			"}\n";
 		$expectedData .= '.ui-widget-header { border: 1px solid ' . $color . '; background: '. $color . '; color: #ffffff;' . "}\n";
 		$expectedData .= '.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active {' .
 			'border: 1px solid ' . $color . ';' .
@@ -824,6 +847,13 @@ public function testGetStylesheetWithAllCombinedInverted() {
 			'opacity: 0.4;' .
 			'color: #000000;'.
 			"}\n";
+		$expectedData .= 'input[type="text"]:focus, input[type="password"]:focus, input[type="search"]:focus, input[type="number"]:focus, input[type="email"]:focus, input[type="tel"]:focus, input[type="url"]:focus, input[type="time"]:focus, input[type="date"]:focus, textarea:focus, select:focus, button:focus, .button:focus, input[type="submit"]:focus, input[type="button"]:focus, #quota:focus, .pager li a:focus { '.
+			'	border: 1px solid ' . $color . ";" .
+			"}\n";
+
+		$expectedData .= 'input[type="submit"]:focus, input[type="button"]:focus, select:focus, button:focus, .button:focus {' .
+			' color: ' . $color. ';'.
+			"}\n";
 		$expectedData .= '.ui-widget-header { border: 1px solid ' . $color . '; background: '. $color . '; color: #ffffff;' . "}\n";
 		$expectedData .= '.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active {' .
 			'border: 1px solid ' . $color . ';' .

diff --git a/core/css/inputs.css b/core/css/inputs.css
@@ -98,7 +98,6 @@ input[type="submit"]:focus,
 input[type="button"]:focus,
 #quota:focus,
 .pager li a:focus {
-	color: #333;
 	border: 1px solid #0082c9;
 }