diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-09-06 10:22:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 10:22:04 +0200 |
| commit | 6f7d200838082f84cd482c5f08612268c9378b9f (patch) | |
| tree | 8e5b00f94483009977d3c403c0a8beebaabd5b13 | |
| parent | 1724fed8c530b0620aa97266b70d236fd8f38102 (diff) | |
| parent | f5aea79bd774f68eac5e2843cb1fe29a3b8f5182 (diff) | |
| download | nextcloud-server-6f7d200838082f84cd482c5f08612268c9378b9f.tar.gz nextcloud-server-6f7d200838082f84cd482c5f08612268c9378b9f.zip | |
Merge pull request #6370 from nextcloud/fix-alternative-logins
Fix layout of alternative login buttons
| -rw-r--r-- | apps/theming/css/theming.scss | 14 | ||||
| -rw-r--r-- | core/css/guest.css | 19 |
2 files changed, 27 insertions, 6 deletions
diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss index 480872354b5..f36ff69e42b 100644 --- a/apps/theming/css/theming.scss +++ b/apps/theming/css/theming.scss @@ -31,13 +31,18 @@ #body-login { - input { + input, + #alternative-logins li a { border: 1px solid nc-lighten($color-primary-text, 50%); } - input.primary { + input.primary, + #alternative-logins li a { background-color: $color-primary; } - a, label, p { + a, + label, + p, + #alternative-logins legend { color: $color-primary-text !important; } input[type='checkbox'].checkbox--white + label:before { @@ -83,7 +88,8 @@ background-color: $color-primary; } -input.primary { +input.primary, +#alternative-logins li a { background-color: $color-primary-element; border: 1px solid $color-primary-text; color: $color-primary-text; diff --git a/core/css/guest.css b/core/css/guest.css index 8909495b540..1081b95fb36 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -400,8 +400,23 @@ form .warning input[type='checkbox']+label { } /* Alternative Logins */ -#alternative-logins legend { margin-bottom:10px; } -#alternative-logins li { height:40px; display:inline-block; white-space:nowrap; } +#alternative-logins legend { + margin-bottom: 10px; +} +#alternative-logins li { + height: 40px; + white-space: nowrap; + padding: 05px; +} +#alternative-logins li a { + width: 100%; + display: inline-block; + text-align: center; + box-sizing: border-box; + background-color: #0082c9; + color: white; + border-radius: 3px; +} /* 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 */ |