From a9eae088faa2899dff961f05c1d4b5197c6c9b7c Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Thu, 18 Jun 2015 12:26:53 -0400
Subject: [PATCH] Bug 1172406 - Wrap the labels in the Master Password
 subdialog. r=Gijs

---
 toolkit/mozapps/preferences/changemp.xul | 32 ++++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/toolkit/mozapps/preferences/changemp.xul b/toolkit/mozapps/preferences/changemp.xul
index 2fee12cceedf..14d02295e048 100644
--- a/toolkit/mozapps/preferences/changemp.xul
+++ b/toolkit/mozapps/preferences/changemp.xul
@@ -14,9 +14,9 @@
 ]>
 
 <dialog id="changemp" title="&setPassword.title;"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-        style="width: 35em;" 
-        ondialogaccept="setPassword();" 
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        style="width: 40em;" 
+        ondialogaccept="setPassword();"
         onload="init()">
 
   <script type="application/javascript" src="chrome://mozapps/content/preferences/changemp.js"/>
@@ -28,30 +28,30 @@
   <groupbox>
     <grid>
       <columns>
+        <column flex="1"/>
         <column/>
-        <column/> 
       </columns>
       <rows>
         <row>
-          <label control="oldpw" value="&setPassword.oldPassword.label;"/> 
+          <label control="oldpw">&setPassword.oldPassword.label;</label>
           <textbox id="oldpw" type="password"/>
-          <!-- This textbox is inserted as a workaround to the fact that making the 'type' 
-                & 'disabled' property of the 'oldpw' textbox toggle between ['password' & 
-                'false'] and ['text' & 'true'] - as would be necessary if the menu has more 
-                than one tokens, some initialized and some not - does not work properly. So, 
-                either the textbox 'oldpw' or the textbox 'message' would be displayed, 
-                depending on the state of the token selected 
+          <!-- This textbox is inserted as a workaround to the fact that making the 'type'
+                & 'disabled' property of the 'oldpw' textbox toggle between ['password' &
+                'false'] and ['text' & 'true'] - as would be necessary if the menu has more
+                than one tokens, some initialized and some not - does not work properly. So,
+                either the textbox 'oldpw' or the textbox 'message' would be displayed,
+                depending on the state of the token selected
           -->
           <textbox id="message" disabled="true" />
         </row>
         <row>
-          <label control="pw1" value="&setPassword.newPassword.label;"/> 
-          <textbox id="pw1" type="password" 
-                   oninput="setPasswordStrength(); checkPasswords();"/> 
+          <label control="pw1">&setPassword.newPassword.label;</label>
+          <textbox id="pw1" type="password"
+                   oninput="setPasswordStrength(); checkPasswords();"/>
         </row>
         <row>
-          <label control="pw2" value="&setPassword.reenterPassword.label;"/> 
-          <textbox id="pw2" type="password" oninput="checkPasswords();"/>  
+          <label control="pw2">&setPassword.reenterPassword.label;</label>
+          <textbox id="pw2" type="password" oninput="checkPasswords();"/>
         </row>
       </rows>
     </grid>