Skip to content

Commit 230dca0

Browse files
LukasReschkeLukasReschke
authored
Merge pull request #1903 from nextcloud/fix-log-in-button
remove slight transparency of primary action button, ref #1615
2 parents 6d2d069 + cbd9fb3 commit 230dca0

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

‎apps/theming/lib/Controller/ThemingController.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,14 +331,12 @@ public function getStylesheet() {
331331
'.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {' .
332332
'border: 1px solid '.$elementColor.';'.
333333
'background-color: '.$elementColor.';'.
334-
'opacity: 0.8;' .
335334
'color: ' . $textColor . ';'.
336335
"}\n" .
337336
'.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,' .
338337
'.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {' .
339338
'border: 1px solid '.$elementColor.';'.
340339
'background-color: '.$elementColor.';'.
341-
'opacity: 1.0;' .
342340
'color: ' . $textColor . ';'.
343341
"}\n" .
344342
'.primary:disabled, input[type="submit"].primary:disabled, input[type="button"].primary:disabled, button.primary:disabled, .button.primary:disabled,' .
@@ -398,6 +396,7 @@ public function getStylesheet() {
398396
$responseCss .= '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . "\n";
399397
$responseCss .= '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . "\n";
400398
$responseCss .= '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }' . "\n";
399+
$responseCss .= '#body-login input.login { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/confirm.svg?v=2\'); }' . "\n";
401400
$responseCss .= '.nc-theming-contrast {color: #000000}' . "\n";
402401
$responseCss .= '.ui-widget-header { color: #000000; }' . "\n";
403402
} else {

‎apps/theming/tests/Controller/ThemingControllerTest.php‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -440,14 +440,12 @@ public function testGetStylesheetWithOnlyColor() {
440440
'.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {' .
441441
'border: 1px solid '.$color.';'.
442442
'background-color: '.$color.';'.
443-
'opacity: 0.8;' .
444443
'color: #ffffff;'.
445444
"}\n" .
446445
'.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,' .
447446
'.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {' .
448447
'border: 1px solid '.$color.';'.
449448
'background-color: '.$color.';'.
450-
'opacity: 1.0;' .
451449
'color: #ffffff;'.
452450
"}\n" .
453451
'.primary:disabled, input[type="submit"].primary:disabled, input[type="button"].primary:disabled, button.primary:disabled, .button.primary:disabled,' .
@@ -530,14 +528,12 @@ public function testGetStylesheetWithOnlyColorInvert() {
530528
'.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {' .
531529
'border: 1px solid '.$elementColor.';'.
532530
'background-color: '.$elementColor.';'.
533-
'opacity: 0.8;' .
534531
'color: #000000;'.
535532
"}\n" .
536533
'.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,' .
537534
'.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {' .
538535
'border: 1px solid '.$elementColor.';'.
539536
'background-color: '.$elementColor.';'.
540-
'opacity: 1.0;' .
541537
'color: #000000;'.
542538
"}\n" .
543539
'.primary:disabled, input[type="submit"].primary:disabled, input[type="button"].primary:disabled, button.primary:disabled, .button.primary:disabled,' .
@@ -570,6 +566,7 @@ public function testGetStylesheetWithOnlyColorInvert() {
570566
$expectedData .= '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . "\n";
571567
$expectedData .= '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . "\n";
572568
$expectedData .= '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }' . "\n";
569+
$expectedData .= '#body-login input.login { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/confirm.svg?v=2\'); }' . "\n";
573570
$expectedData .= '.nc-theming-contrast {color: #000000}' . "\n";
574571
$expectedData .= '.ui-widget-header { color: #000000; }' . "\n";
575572

@@ -706,14 +703,12 @@ public function testGetStylesheetWithAllCombined() {
706703
'.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {' .
707704
'border: 1px solid '.$color.';'.
708705
'background-color: '.$color.';'.
709-
'opacity: 0.8;' .
710706
'color: #ffffff;'.
711707
"}\n" .
712708
'.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,' .
713709
'.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {' .
714710
'border: 1px solid '.$color.';'.
715711
'background-color: '.$color.';'.
716-
'opacity: 1.0;' .
717712
'color: #ffffff;'.
718713
"}\n" .
719714
'.primary:disabled, input[type="submit"].primary:disabled, input[type="button"].primary:disabled, button.primary:disabled, .button.primary:disabled,' .
@@ -813,14 +808,12 @@ public function testGetStylesheetWithAllCombinedInverted() {
813808
'.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {' .
814809
'border: 1px solid '.$elementColor.';'.
815810
'background-color: '.$elementColor.';'.
816-
'opacity: 0.8;' .
817811
'color: #000000;'.
818812
"}\n" .
819813
'.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,' .
820814
'.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {' .
821815
'border: 1px solid '.$elementColor.';'.
822816
'background-color: '.$elementColor.';'.
823-
'opacity: 1.0;' .
824817
'color: #000000;'.
825818
"}\n" .
826819
'.primary:disabled, input[type="submit"].primary:disabled, input[type="button"].primary:disabled, button.primary:disabled, .button.primary:disabled,' .
@@ -871,6 +864,7 @@ public function testGetStylesheetWithAllCombinedInverted() {
871864
$expectedData .= '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . "\n";
872865
$expectedData .= '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . "\n";
873866
$expectedData .= '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }' . "\n";
867+
$expectedData .= '#body-login input.login { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/confirm.svg?v=2\'); }' . "\n";
874868
$expectedData .= '.nc-theming-contrast {color: #000000}' . "\n";
875869
$expectedData .= '.ui-widget-header { color: #000000; }' . "\n";
876870

0 commit comments

Comments
 (0)