summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2017-05-16 13:11:55 +0200
committerGitHub <noreply@github.com>2017-05-16 13:11:55 +0200
commitfd74428cdb29a3f544e09fdb2c80395beedd50a9 (patch)
tree6ec11cb28208aa0f19c39ba476ddc9cd69fab52c
parente22b957d7f8705ba87096b05fbb375aca392b076 (diff)
parent30443ac177607e9e76738898daa79c026a454f66 (diff)
downloadnextcloud-server-fd74428cdb29a3f544e09fdb2c80395beedd50a9.tar.gz
nextcloud-server-fd74428cdb29a3f544e09fdb2c80395beedd50a9.zip
Merge pull request #4865 from nextcloud/improve-two-factor-buttons
Improve layout of buttons for two factor auth
-rw-r--r--apps/twofactor_backupcodes/css/style.css4
-rw-r--r--core/css/guest.css15
2 files changed, 17 insertions, 2 deletions
diff --git a/apps/twofactor_backupcodes/css/style.css b/apps/twofactor_backupcodes/css/style.css
index 0e15290b86a..396192b43a7 100644
--- a/apps/twofactor_backupcodes/css/style.css
+++ b/apps/twofactor_backupcodes/css/style.css
@@ -5,11 +5,13 @@
.challenge {
margin-top: 0 !important;
margin-left: 0 !important;
+ box-sizing: border-box !important;
+ width: 100% !important;
}
.confirm-inline {
position: absolute;
- right: 10px;
+ right: 0;
top: 0;
margin: 0 !important;
padding-right: 25px !important;
diff --git a/core/css/guest.css b/core/css/guest.css
index 657a4adbdef..d55d8785b43 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -347,8 +347,18 @@ form .warning input[type='checkbox']+label {
}
.two-factor-link {
display: inline-block;
- padding: 12px;
color: rgba(255, 255, 255, 0.75);
+ width: 100%;
+}
+.two-factor-link .button {
+ padding: 10px;
+ border-radius: 3px;
+ color: #555 !important;
+ display: inline-block;
+ margin: 5px 0;
+ text-align: center;
+ width: 100%;
+ box-sizing: border-box
}
/* Additional login options */
@@ -453,6 +463,9 @@ form #selectDbType label.ui-state-active {
border-radius: 3px;
cursor: default;
}
+.warning {
+ margin-top: 15px;
+}
.warning.updateAnyways {
text-align: center;
}