From 3384b2f53c8025e0a2f8ff1defbca3e3c9e99c1d Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 25 Jan 2017 12:05:43 +0100
Subject: fix personal page password form layout

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 settings/css/settings.css       |  2 +-
 settings/templates/personal.php | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'settings')

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>
-- 
cgit v1.2.3