fix personal page password form layout

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>

diff --git a/core/css/styles.scss b/core/css/styles.scss
index d1e3a9f7be324a3801540fdc2d69b44ceb659cdd..c7f1c2d633c72def72ae2c7483773d20b91db27d 100644 (file)
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -568,15 +568,16 @@ label.infield {
        padding-right: 30px;
 }
 
+.personal-show-container {
+       position: relative;
+       display: inline-block;
+       margin-right: 6px;
+}
 #personal-show + label {
-       height: 14px;
-       margin-top: -25px;
-       left: 267px;
        display: block;
-}
-
-#passwordbutton {
-       margin-left: .5em;
+       right: 0;
+       margin-top: -36px;
+    padding: 6px 4px;
 }
 
 /* Database selector */

diff --git a/settings/css/settings.css b/settings/css/settings.css
index fde2b031f23693f546275a271cb4d0d47dec1d8b..7f80f647acb5196eedaa8d2c107e5af1b38e72c4 100644 (file)
--- 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 d3a835c4a16d1206d57f31a4cdf7e455560c478a..65ce3751b9809fe629f8b495fbac69d000fca6c2 100644 (file)
--- 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>