summaryrefslogtreecommitdiffstats
path: root/core/css
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-08-08 14:40:35 +0200
committerGitHub <noreply@github.com>2017-08-08 14:40:35 +0200
commitd7645ee9283352092c2a4e480536cbcb99a2e86c (patch)
treea6c0f974088293e8f952d67246c92cdb0be8ae13 /core/css
parent481002a00bcd88d6f90517e2e92e7bbfa9719021 (diff)
parent92d28fdc6833f99c79867fef57e94882071baa50 (diff)
downloadnextcloud-server-d7645ee9283352092c2a4e480536cbcb99a2e86c.tar.gz
nextcloud-server-d7645ee9283352092c2a4e480536cbcb99a2e86c.zip
Merge pull request #5972 from nextcloud/replace-loading-icon-gif-with-pure-css-in-login-button
Replace loading icon GIF with pure CSS in login button
Diffstat (limited to 'core/css')
-rw-r--r--core/css/guest.css22
-rw-r--r--core/css/styles.scss23
2 files changed, 45 insertions, 0 deletions
diff --git a/core/css/guest.css b/core/css/guest.css
index e65f0a5de01..56f8c728d00 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -131,6 +131,28 @@ form #datadirField legend {
}
/* Buttons and input */
+#submit-wrapper {
+ position: relative; /* Make the wrapper the containing block of its
+ absolutely positioned descendant icons */
+}
+#submit-wrapper .icon-confirm-white {
+ position: absolute;
+ top: 23px;
+ right: 23px;
+}
+#submit-wrapper .icon-loading-small {
+ position: absolute;
+ top: 22px;
+ right: 24px;
+}
+
+#submit-wrapper #submit-icon {
+ pointer-events: none; /* The submit icon is positioned on the submit button.
+ From the user point of view the icon is part of the
+ button, so the clicks on the icon have to be
+ applied to the button instead. */
+}
+
input, textarea, select, button {
font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
}
diff --git a/core/css/styles.scss b/core/css/styles.scss
index f2acca38e1e..667ca0dc2be 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -754,6 +754,29 @@ label.infield {
/* Log in and install button */
+#body-login #submit-wrapper {
+ position: relative; /* Make the wrapper the containing block of its
+ absolutely positioned descendant icons */
+
+ .icon-confirm-white {
+ position: absolute;
+ top: 23px;
+ right: 23px;
+ }
+ .icon-loading-small {
+ position: absolute;
+ top: 22px;
+ right: 24px;
+ }
+
+ #submit-icon {
+ pointer-events: none; /* The submit icon is positioned on the submit
+ button. From the user point of view the icon is
+ part of the button, so the clicks on the icon
+ have to be applied to the button instead. */
+ }
+}
+
#body-login input {
font-size: 20px;
margin: 5px;