sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6370 from nextcloud/fix-alternative-logins 

Fix layout of alternative login buttons
pull/6363/merge
Morris Jobke 2017-09-06 10:22:04 +07:00 committed by GitHub
parent 1724fed8c5 f5aea79bd7
commit 6f7d200838
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/theming/css/theming.scss
Unescape Escape View File

@ -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;

19
core/css/guest.css
Unescape Escape View File

@ -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 */