mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3255 from nextcloud/fix-password-form 

fix personal page password form layout
This commit is contained in:
Morris Jobke 2017-01-25 19:19:26 -06:00 committed by GitHub
parent 05e3aa491a 3384b2f53c
commit 694fa879fb
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/css/styles.scss
View File

@ -579,15 +579,16 @@ label.infield {
padding-right: 30px; padding-right: 30px;
} }
#personal-show + label { .personal-show-container {
height: 14px; position: relative;
margin-top: -25px; display: inline-block;
left: 267px; margin-right: 6px;
display: block;
} }
#personal-show + label {
#passwordbutton { display: block;
margin-left: .5em; right: 0;
margin-top: -36px;
padding: 6px 4px;
} }
/* Database selector */ /* Database selector */

2
settings/css/settings.css
View File

@ -848,7 +848,7 @@ span.indeterminate {
/* PASSWORD */ /* PASSWORD */
#passwordform .strengthify-wrapper { #passwordform .strengthify-wrapper {
position: absolute; position: absolute;
left: 166px; left: 0;
width: 130px; width: 130px;
margin-top: -6px; margin-top: -6px;
} }

14
settings/templates/personal.php
View File

@ -186,12 +186,14 @@ if($_['passwordChangeSupported']) {
<input type="password" id="pass1" name="oldpassword" <input type="password" id="pass1" name="oldpassword"
placeholder="<?php p($l->t('Current password'));?>" placeholder="<?php p($l->t('Current password'));?>"
autocomplete="off" autocapitalize="off" autocorrect="off" /> autocomplete="off" autocapitalize="off" autocorrect="off" />
<label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label> <div class="personal-show-container">
<input type="password" id="pass2" name="newpassword" <label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
placeholder="<?php p($l->t('New password')); ?>" <input type="password" id="pass2" name="newpassword"
data-typetoggle="#personal-show" placeholder="<?php p($l->t('New password')); ?>"
autocomplete="off" autocapitalize="off" autocorrect="off" /> data-typetoggle="#personal-show"
<input type="checkbox" id="personal-show" name="show" /><label for="personal-show" class="personal-show-label"></label> 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')); ?>" /> <input id="passwordbutton" type="submit" value="<?php p($l->t('Change password')); ?>" />
<br/> <br/>
</form> </form>