summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-01-25 19:19:26 -0600
committerGitHub <noreply@github.com>2017-01-25 19:19:26 -0600
commit694fa879fbb97d5c984448e58d75c919a1118240 (patch)
tree84505a68d54c746cebcb81e4633b88e5c9ef14c9 /settings
parent05e3aa491ad14c47936b5523a179d040f5d76421 (diff)
parent3384b2f53c8025e0a2f8ff1defbca3e3c9e99c1d (diff)
downloadnextcloud-server-694fa879fbb97d5c984448e58d75c919a1118240.tar.gz
nextcloud-server-694fa879fbb97d5c984448e58d75c919a1118240.zip
Merge pull request #3255 from nextcloud/fix-password-form
fix personal page password form layout
Diffstat (limited to 'settings')
-rw-r--r--settings/css/settings.css2
-rw-r--r--settings/templates/personal.php14
2 files changed, 9 insertions, 7 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css
index fde2b031f23..7f80f647acb 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -848,7 +848,7 @@ span.indeterminate {
/* PASSWORD */
#passwordform .strengthify-wrapper {
position: absolute;
- left: 166px;
+ left: 0;
width: 130px;
margin-top: -6px;
}
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index d3a835c4a16..65ce3751b98 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -186,12 +186,14 @@ if($_['passwordChangeSupported']) {
<input type="password" id="pass1" name="oldpassword"
placeholder="<?php p($l->t('Current password'));?>"
autocomplete="off" autocapitalize="off" autocorrect="off" />
- <label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
- <input type="password" id="pass2" name="newpassword"
- placeholder="<?php p($l->t('New password')); ?>"
- data-typetoggle="#personal-show"
- autocomplete="off" autocapitalize="off" autocorrect="off" />
- <input type="checkbox" id="personal-show" name="show" /><label for="personal-show" class="personal-show-label"></label>
+ <div class="personal-show-container">
+ <label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
+ <input type="password" id="pass2" name="newpassword"
+ placeholder="<?php p($l->t('New password')); ?>"
+ data-typetoggle="#personal-show"
+ autocomplete="off" autocapitalize="off" autocorrect="off" />
+ <input type="checkbox" id="personal-show" name="show" /><label for="personal-show" class="personal-show-label"></label>
+ </div>
<input id="passwordbutton" type="submit" value="<?php p($l->t('Change password')); ?>" />
<br/>
</form>