Merge pull request #31500 from nextcloud/bugfix/noid/fix-alternativ-login-buttons

Fix alternative login buttons

3 files changed, 15 insertions, 29 deletions

diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index 81b1b1a87ec..52337d2105f 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -167,8 +167,7 @@ $invert: luma($color-primary) > 0.6;
 	}
 }
 
-input.primary,
-.alternative-logins a, {
+input.primary {
 	background-color: $color-primary-element;
 	border: 1px solid $color-primary-text;
 	color: $color-primary-text;
@@ -202,17 +201,15 @@ input.primary,
 			}
 		}
 
-		input,
-		.alternative-logins a {
+		input {
 			border: 1px solid nc-lighten($color-primary-text, 50%);
 		}
 		input.primary,
-		button.primary,
-		.alternative-logins a {
+		button.primary {
 			background-color: $color-primary;
 			color: $color-primary-text;
 		}
-		a,
+		:not(div.alternative-logins) > a,
 		label,
 		footer p,
 		.alternative-logins legend,
@@ -257,7 +254,7 @@ input.primary,
 	}
 	#body-login {
 
-		a, label, p {
+		:not(.alternative-logins) a, label, p {
 			color: $color-primary-text;
 		}
 
diff --git a/core/css/guest.css b/core/css/guest.css
index a648f75f64f..d48713061ec 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -587,11 +587,19 @@ form .warning input[type='checkbox']+label {
 	display: inline-block;
 	text-align: center;
 	box-sizing: border-box;
+	border: 2px solid #ffffff;
 	background-color: #0082c9;
-	color: white;
+	color: #ffffff;
 	border-radius: 100px; /* --border-radius-pill */
 }
 
+.alternative-logins a.button:focus,
+.alternative-logins li a:focus {
+	border: 2px solid #000000;
+	background-image: linear-gradient(40deg, #0082c9 0%, #30b6ff 100%);
+	background-position: initial;
+}
+
 /* fixes for update page TODO should be fixed some time in a proper way */
 /* this is just for an error while updating the ownCloud instance */
 .updateProgress .error {
diff --git a/core/css/styles.scss b/core/css/styles.scss
index ad7d9d1666b..8a15cfa19d8 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -381,26 +381,7 @@ body {
 }
 
 /* fixes for update page TODO should be fixed some time in a proper way */
-/* this is just for an error while updating the ownCloud instance */
-
-/* Alternative Logins */
-
-#alternative-logins {
-	legend {
-		margin-bottom: 10px;
-	}
-	li {
-		height: 40px;
-		display: inline-block;
-		white-space: nowrap;
-	}
-}
-
-/* Log in and install button */
-
-#remember_login {
-	margin: 18px 5px 0 16px !important;
-}
+/* this is just for an error while updating the Nextcloud instance */
 
 /* Sticky footer */