aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorochorocho <rothjochen@gmail.com>2019-08-26 20:01:44 +0200
committerochorocho <rothjochen@gmail.com>2019-08-26 20:01:44 +0200
commit068f1d28f3fd3a97c2c5abfd408dec8e0d0cbcd7 (patch)
tree79b415b989bf00bc5bbfd2470d554bef2d20e7f7 /core
parentf46b21e4d9247b5764e76b6f0c1cfa6e1b7a80ae (diff)
downloadnextcloud-server-068f1d28f3fd3a97c2c5abfd408dec8e0d0cbcd7.tar.gz
nextcloud-server-068f1d28f3fd3a97c2c5abfd408dec8e0d0cbcd7.zip
Move alternative login above standard login, optimize alignment
Signed-off-by: ochorocho <rothjochen@gmail.com>
Diffstat (limited to 'core')
-rw-r--r--core/css/guest.css26
-rw-r--r--core/templates/login.php19
2 files changed, 33 insertions, 12 deletions
diff --git a/core/css/guest.css b/core/css/guest.css
index 4d7df8b8996..6553dbd48ee 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -95,6 +95,7 @@ body {
max-width: 100%;
max-height: 200px;
}
+
.wrapper {
width: 300px;
margin-top: 10vh;
@@ -143,7 +144,8 @@ form #datadirField legend {
/* Buttons and input */
#submit-wrapper,
-#reset-password-wrapper {
+#reset-password-wrapper,
+#alternative-logins {
display: flex;
align-items: center;
justify-content: center;
@@ -151,6 +153,28 @@ form #datadirField legend {
absolutely positioned descendant icons */
}
+#alternative-logins {
+ margin: 10px 15px 20px;
+ display: block;
+}
+
+#alternative-logins a {
+ margin: 5px;
+ display: block;
+ font-size: 15px;
+}
+
+
+@media only screen and (max-width: 1024px) {
+ .wrapper {
+ margin-top: 0;
+ }
+ #alternative-logins {
+ margin: 0px 15px 10px;
+ }
+}
+
+
#submit-wrapper .submit-icon,
#reset-password-wrapper .submit-icon {
position: absolute;
diff --git a/core/templates/login.php b/core/templates/login.php
index 548216d4620..8a426b492eb 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -3,15 +3,12 @@
script('core', 'dist/login');
?>
-<div id="login"></div>
<?php if (!empty($_['alt_login'])) { ?>
-<form id="alternative-logins">
- <fieldset>
- <ul>
- <?php foreach($_['alt_login'] as $login): ?>
- <li><a class="button" href="<?php print_unescaped($login['href']); ?>" ><?php p($login['name']); ?></a></li>
- <?php endforeach; ?>
- </ul>
- </fieldset>
-</form>
-<?php }
+ <div id="alternative-logins">
+ <?php foreach($_['alt_login'] as $login): ?>
+ <a class="button primary" href="<?php print_unescaped($login['href']); ?>" ><?php p($login['name']); ?></a>
+ <?php endforeach; ?>
+ </div>
+<?php } ?>
+
+<div id="login"></div>