Bug 1613758 - Update the Account Manager in Tab UI to match the Preferences Tab UI. r=aleca a=wsmwk
authorRichard Marti <richard.marti@gmail.com>
Tue, 11 Feb 2020 21:16:14 +0100
changeset 37291 af9061aaf712df08e2a2f3fe989bf342a634417b
parent 37290 a376c45565b713903b4984559a2f414736c6c920
child 37292 0e08687e9ecdbc62f6ad391d859710e965a39bd2
push id2559
push userthunderbird@calypsoblue.org
push dateFri, 21 Feb 2020 22:57:54 +0000
treeherdercomm-beta@8c986f1b128d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaleca, wsmwk
bugs1613758
Bug 1613758 - Update the Account Manager in Tab UI to match the Preferences Tab UI. r=aleca a=wsmwk
chat/content/imAccountOptionsHelper.js
mail/components/im/content/am-im.xhtml
mail/themes/linux/mail/accountManage.css
mail/themes/osx/mail/accountManage.css
mail/themes/shared/mail/accountManage.css
mail/themes/windows/mail/accountManage.css
mailnews/base/prefs/content/AccountManager.xhtml
mailnews/base/prefs/content/am-copies.xhtml
mailnews/base/prefs/content/am-identities-list.xhtml
mailnews/base/prefs/content/am-identity-edit.xhtml
mailnews/base/prefs/content/am-junk.xhtml
mailnews/base/prefs/content/am-main.xhtml
mailnews/base/prefs/content/am-offline.xhtml
mailnews/base/prefs/content/am-server-advanced.xhtml
mailnews/base/prefs/content/am-server.xhtml
mailnews/base/prefs/content/am-serverwithnoidentities.xhtml
mailnews/base/prefs/content/am-smtp.xhtml
mailnews/extensions/newsblog/content/am-newsblog.xhtml
mailnews/extensions/smime/content/am-smime.inc.xhtml
mailnews/extensions/smime/content/am-smime.xhtml
--- a/chat/content/imAccountOptionsHelper.js
+++ b/chat/content/imAccountOptionsHelper.js
@@ -86,17 +86,17 @@ var accountOptionsHelper = {
           break;
         case Ci.prplIPref.typeInt:
           vbox.appendChild(
             this.createTextbox("number", opt.getInt(), text, name)
           );
           break;
         case Ci.prplIPref.typeString:
           vbox.appendChild(
-            this.createTextbox(null, opt.getString(), text, name)
+            this.createTextbox("text", opt.getString(), text, name)
           );
           break;
         case Ci.prplIPref.typeList:
           vbox.appendChild(this.createMenulist(opt.getList(), text, name));
           document.getElementById(name).value = opt.getListDefault();
           break;
         default:
           throw new Error("unknown preference type " + opt.type);
--- a/mail/components/im/content/am-im.xhtml
+++ b/mail/components/im/content/am-im.xhtml
@@ -1,15 +1,14 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 
 <!DOCTYPE window [
   <!ENTITY % imDTD SYSTEM "chrome://messenger/locale/am-im.dtd">
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
   %imDTD;
   %brandDTD;
 ]>
 
--- a/mail/themes/linux/mail/accountManage.css
+++ b/mail/themes/linux/mail/accountManage.css
@@ -1,10 +1,22 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @import url("chrome://messenger/skin/shared/accountManage.css");
 
+window > vbox,
+#accountTreeBox {
+  font-size: 1.11em;
+}
+
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-smtp) {
   list-style-image: url("chrome://messenger/skin/icons/server.png");
   -moz-image-region: rect(16px 64px 32px 48px);
 }
+
+#accountActionsButton > .button-box > .button-menu-dropmarker {
+  margin-inline-end: 4px;
+  list-style-image: url("chrome://global/skin/icons/arrow-dropdown-12.svg");
+  -moz-context-properties: fill;
+  fill: currentColor;
+}
--- a/mail/themes/osx/mail/accountManage.css
+++ b/mail/themes/osx/mail/accountManage.css
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @import url("chrome://messenger/skin/shared/accountManage.css");
 
-
-#accounttree {
-  margin-inline-end: 8px;
+window > vbox,
+#accountTreeBox {
+  font-size: 1.36em;
 }
 
 treechildren::-moz-tree-cell-text(folderNameCol, isServer-true) {
   font-weight: bold;
 }
 
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-smtp) {
   list-style-image: url("chrome://messenger/skin/icons/server.png");
@@ -36,14 +36,17 @@ button:not(.dialog-button) {
 description {
   margin: 4px 4px 8px;
 }
 
 #archiveTree > treechildren {
   background-color: #FFFFFF;
 }
 
-/* ::::: dialog header ::::: */
-
-.dialogheader {
-  margin: 0 5px 5px;
-  padding: 5px 8px;
+#accountActionsButton> .button-box > .button-menu-dropmarker {
+  -moz-appearance: none;
+  display: -moz-box;
+  list-style-image: url("chrome://global/skin/icons/arrow-dropdown-12.svg");
+  -moz-context-properties: fill;
+  fill: currentColor;
+  width: 12px;
+  height: 12px;
 }
--- a/mail/themes/shared/mail/accountManage.css
+++ b/mail/themes/shared/mail/accountManage.css
@@ -2,19 +2,113 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== accountManage.css ==============================================
   == Styles for the Mail Account Manager.
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://global/skin/in-content/common.css");
+@import url("chrome://messenger/skin/preferences/preferences.css");
+
+window > vbox {
+  padding-block: 40px;
+  padding-inline: 25px 28px;
+}
+
+groupbox {
+  -moz-appearance: none;
+  border-style: none;
+  margin: 0 0 32px;
+  padding: initial;
+}
+
+#accountTreeBox {
+  margin-block: 28px;
+  margin-inline: 28px 3px;
+}
+
+/* Styles for the Account Actions button */
+
+#accountActionsButton {
+  margin-inline: 0;
+}
+
+#accountActionsDropdown {
+  -moz-appearance: none;
+  min-width: 32ch;
+  font-size: 1em;
+  border: 1px solid var(--in-content-box-border-color);
+  border-radius: 2px;
+  background-color: var(--in-content-box-background);
+}
+
+#accountActionsDropdown menuitem {
+  -moz-appearance: none;
+  color: var(--in-content-text-color);
+  padding-block: 0.2em;
+  padding-inline: 10px 30px;
+}
+
+#accountActionsDropdown > menuitem:not([disabled="true"])[_moz-menuactive="true"] {
+  color: var(--in-content-text-color);
+  background-color: var(--in-content-item-hover);
+}
+
+#accountActionsDropdown > menuitem:not([disabled="true"])[selected="true"] {
+  color: var(--in-content-selected-text);
+  background-color: var(--in-content-item-selected);
+}
+
+#accountActionsDropdown > menuitem[disabled="true"] {
+  color: #999;
+  /* override the [_moz-menuactive="true"] background color from
+     global/menu.css */
+  background-color: transparent;
+}
+
+#accountActionsDropdown menuseparator {
+  -moz-appearance: none;
+  margin: 0;
+  padding: 0;
+  border-top: 1px solid var(--in-content-box-border-color);
+  border-bottom: none;
+}
 
 /* ::::: account manager :::::: */
 
+.header {
+  font-size: 1.1em;
+  font-weight: 600;
+  line-height: 1.4em;
+  margin-block: 16px 4px;
+  padding-bottom: 0;
+}
+
+.input-container:not([hidden="true"]) {
+  display: flex;
+}
+
+.input-container:not([hidden="true"]) > .input-inline {
+  flex: 1;
+}
+
+.identity-table {
+  margin-inline-end: 14px;
+}
+
+.folderMenuItem > .menulist-dropmarker {
+  -moz-image-region: auto;
+}
+
+menupopup[is="folder-menupopup"] {
+  -moz-appearance: none;
+}
+
 .specialFolderPickerGrid {
   margin-inline-start: 20px;
 }
 
 .fccReplyFollowsParent {
   margin-inline-start: 20px;
 }
 
@@ -34,79 +128,77 @@ treechildren::-moz-tree-cell-text(isDefa
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-im) {
   list-style-image: url("chrome://chat/skin/prpl-generic/icon.png");
 }
 
 #accounttree treechildren::-moz-tree-indentation {
   width: 1ch;
 }
 
-#accountActionsDropdown {
-  min-width: 30ch;
+.label-inline {
+  margin-block: auto;
+  min-width: 200px;
 }
 
 /* ::::: SMTP Server Panel :::::: */
 
 .smtpServerListItem {
   padding-inline-start: 3px;
 }
 
 #backgroundBox {
-  background-color: #FFFFFF;
-  opacity: 0.5;
+  background-color: var(--in-content-box-background);
 }
 
 #smtpServerInfoBox {
-  border: 1px solid ThreeDShadow;
-  border-right-color: ThreeDHighlight;
-  border-bottom-color: ThreeDHighlight;
-  margin: 0 5px 5px;
+  background-color: var(--in-content-box-background);
+  margin: 0 6px 5px;
+}
+
+#smtpServerInfoBox label {
+  height: 30px;
+  margin-block: 0;
+  padding-block: 3px;
+}
+
+#smtpServerInfoBox .input-container {
+  display: flex;
+  height: 30px;
+}
+
+.input-container > .plain {
+  flex: 1;
+  background-color: transparent;
+  border-style: none;
+  padding-block: 0;
 }
 
 #smtpServerInfoBox textbox {
   background-color: transparent;
 }
 
 #archiveTree > treechildren {
   background-color: -moz-Field;
 }
 
 /* ::::: dialog header ::::: */
 
-.dialogheader {
-  margin: 0 5px 5px;
-  border: 1px solid ThreeDDarkShadow;
-  padding: 5px 8px;
-  background-color: Highlight;
-  color: HighlightText;
-}
-
 .dialogheader-title {
-  margin: 0 !important;
-  font-size: larger;
-  font-weight: bold;
+  margin-block: 0 8px;
+  margin-inline-start: 0;
+  font-size: 1.46em;
+  font-weight: 300;
+  line-height: 1.3em;
+  color: var(--in-content-text-color);
 }
 
 .identity-table th {
   font-weight: normal;
   text-align: left;
 }
 
 .identity-table td {
   padding-inline-end: 10px;
 }
 
 .identity-table td input {
   width: 100%;
 }
-
-input[type="number"].size2 {
-  width: calc(2ch + 30px);
-}
-input[type="number"].size3 {
-  width: calc(3ch + 30px);
-}
-input[type="number"].size4 {
-  width: calc(4ch + 30px);
-}
-input[type="number"].size5 {
-  width: calc(5ch + 30px);
-}
--- a/mail/themes/windows/mail/accountManage.css
+++ b/mail/themes/windows/mail/accountManage.css
@@ -1,10 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @import url("chrome://messenger/skin/shared/accountManage.css");
 
+window > vbox,
+#accountTreeBox {
+  font-size: 1.25em;
+}
+
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-smtp) {
   list-style-image: url("chrome://messenger/skin/icons/server.png");
   -moz-image-region: rect(16px 64px 32px 48px);
 }
--- a/mailnews/base/prefs/content/AccountManager.xhtml
+++ b/mailnews/base/prefs/content/AccountManager.xhtml
@@ -19,17 +19,17 @@
 <script src="chrome://messenger/content/am-prefs.js"/>
 <script src="chrome://messenger/content/AccountManager.js"/>
 #ifdef MOZ_SUITE
 <script src="chrome://messenger/content/am-help.js"/>
 #endif
 <script src="chrome://messenger/content/amUtils.js"/>
 
   <hbox flex="1">
-    <vbox style="&accountTree.width;">
+    <vbox id="accountTreeBox" style="&accountTree.width;">
       <tree flex="1" onselect="onAccountTreeSelect(null, null);" id="accounttree"
             seltype="single" hidecolumnpicker="true">
         <treecols>
           <treecol id="AccountCol" flex="1" primary="true" hideheader="true"/>
         </treecols>
         <treechildren id="account-tree-children"/>
       </tree>
 
--- a/mailnews/base/prefs/content/am-copies.xhtml
+++ b/mailnews/base/prefs/content/am-copies.xhtml
@@ -1,17 +1,15 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-copies.dtd">
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="&copyAndFolderTitle.label;"
         onload="parent.onPanelLoaded('am-copies.xhtml');">
 
--- a/mailnews/base/prefs/content/am-identities-list.xhtml
+++ b/mailnews/base/prefs/content/am-identities-list.xhtml
@@ -31,17 +31,16 @@
 </keyset>
 
 <label control="identitiesList">&identitiesListManageDesc.label;</label>
 
 <separator class="thin"/>
 
 <hbox flex="1">
   <richlistbox id="identitiesList"
-               class="theme-listbox"
                ondblclick="onEdit(event);"
                onselect="updateButtons();"
                seltype="single"
                flex="1"/>
 
   <vbox>
     <button id="addButton"
             command="cmd_add" label="&identitiesListAdd.label;"
--- a/mailnews/base/prefs/content/am-identity-edit.xhtml
+++ b/mailnews/base/prefs/content/am-identity-edit.xhtml
@@ -1,17 +1,16 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % identityEditDTD SYSTEM "chrome://messenger/locale/am-identity-edit.dtd" >
 %identityEditDTD;
 <!ENTITY % identityDTD SYSTEM "chrome://messenger/locale/am-main.dtd" >
 %identityDTD;
 <!ENTITY % copiesDTD SYSTEM "chrome://messenger/locale/am-copies.dtd">
 %copiesDTD;
--- a/mailnews/base/prefs/content/am-junk.xhtml
+++ b/mailnews/base/prefs/content/am-junk.xhtml
@@ -1,18 +1,15 @@
 <?xml version="1.0"?>
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
 <!ENTITY % junkMailDTD SYSTEM "chrome://messenger/locale/am-junk.dtd">
 %junkMailDTD;
 ]>
@@ -94,17 +91,17 @@
                   genericattr="true"
                   pref="true"
                   wsm_persist="true"
                   preftype="bool"
                   prefstring="mail.server.%serverkey%.useWhiteList"/>
         <label id="whiteListLabel"
                accesskey="&whitelistHeader.accesskey;"
                control="whiteListAbURI">&whitelistHeader.label;</label>
-        <richlistbox id="whiteListAbURI" class="theme-listbox" height="100px"/>
+        <richlistbox id="whiteListAbURI" height="200px"/>
       </vbox>
 
       <separator/>
 
       <vbox>
         <hbox>
           <checkbox id="server.useServerFilter"
                     label="&ispHeaders.label;"
--- a/mailnews/base/prefs/content/am-main.xhtml
+++ b/mailnews/base/prefs/content/am-main.xhtml
@@ -1,15 +1,14 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-main.dtd" >
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="parent.onPanelLoaded('am-main.xhtml');">
 
   <vbox flex="1" style="overflow: auto;">
@@ -114,17 +113,17 @@
               <checkbox id="identity.htmlSigFormat" wsm_persist="true" label="&signatureHtml.label;"
                         prefattribute="value" accesskey="&signatureHtml.accesskey;" style="width:100%;"
                         prefstring="mail.identity.%identitykey%.htmlSigFormat"/>
             </hbox>
           </html:td>
         </html:tr>
       </html:table>
 
-      <hbox class="indent" flex="1" style="min-height: 50px;display: flex;align-items: stretch;">
+      <hbox class="indent" flex="1" style="min-height: 100px; display: flex; align-items: stretch;">
         <html:textarea id="identity.htmlSigText" wsm_persist="true" rows="4" style="flex-grow: 1;"
                        prefstring="mail.identity.%identitykey%.htmlSigText" class="signatureBox"/>
       </hbox>
 
       <hbox align="center">
         <checkbox id="identity.attachSignature"
                   wsm_persist="true"
                   label="&signatureFile.label;"
--- a/mailnews/base/prefs/content/am-offline.xhtml
+++ b/mailnews/base/prefs/content/am-offline.xhtml
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-offline.dtd">
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         onload="parent.onPanelLoaded('am-offline.xhtml');">
 
   <vbox flex="1" style="overflow: auto;">
--- a/mailnews/base/prefs/content/am-server-advanced.xhtml
+++ b/mailnews/base/prefs/content/am-server-advanced.xhtml
@@ -2,17 +2,16 @@
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-server-advanced.dtd">
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="&serverAdvanced.label;"
         onload="onLoad();">
 <dialog buttons="accept,cancel">
--- a/mailnews/base/prefs/content/am-server.xhtml
+++ b/mailnews/base/prefs/content/am-server.xhtml
@@ -1,18 +1,16 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at https://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/content/am-server.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % trashDTD SYSTEM "chrome://messenger/locale/am-server-top.dtd">
 %trashDTD;
 ]>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
@@ -64,17 +62,17 @@
                     aria-labelledby="fixedServerName"/>
       </div>
       <div class="input-container" hidefor="movemail" style="grid-row: 2;">
         <xul:label value="&port.label;"
                    accesskey="&port.accesskey;" control="server.port"/>
         <xul:label id="fixedServerPort"
                    collapsed="true" use="server.port"/>
         <html:input id="server.port" type="number"
-                    class="size3 input-inline"
+                    class="size3"
                     min="1" max="65535"
                     wsm_persist="true"
                     preftype="int"
                     prefstring="mail.server.%serverkey%.port"/>
         <xul:label value="&serverPortDefault.label;"/>
         <xul:label id="defaultPort"/>
       </div>
       <div hidefor="nntp" style="grid-row: 3;">
@@ -166,17 +164,17 @@
         <checkbox wsm_persist="true"
                   id="server.doBiff"
                   label="&biffStart.label;"
                   accesskey="&biffStart.accesskey;"
                   oncommand="onCheckItem('server.biffMinutes', [this.id]);"
                   prefattribute="value"
                   prefstring="mail.server.%serverkey%.check_new_mail"/>
         <html:input id="server.biffMinutes" type="number"
-                    class="size3 input-inline" min="1"
+                    class="size3" min="1"
                     wsm_persist="true"
                     aria-labelledby="server.doBiff server.biffMinutes biffEnd"
                     preftype="int"
                     prefstring="mail.server.%serverkey%.check_time"/>
         <label id="biffEnd"
                control="server.biffMinutes"
                value="&biffEnd.label;"/>
       </hbox>
@@ -214,17 +212,17 @@
 
       <hbox align="center">
         <checkbox wsm_persist="true" id="pop3.deleteByAgeFromServer" class="indent"
                   label="&deleteByAgeFromServer.label;" oncommand="setupAgeMsgOnServerUI();"
                   accesskey="&deleteByAgeFromServer.accesskey;"
                   prefattribute="value"
                   prefstring="mail.server.%serverkey%.delete_by_age_from_server"/>
         <html:input id="pop3.numDaysToLeaveOnServer" type="number"
-                    class="size3 input-inline" min="1"
+                    class="size3" min="1"
                     wsm_persist="true"
                     aria-labelledby="pop3.deleteByAgeFromServer pop3.numDaysToLeaveOnServer daysEnd"
                     preftype="int"
                     prefstring="mail.server.%serverkey%.num_days_to_leave_on_server"/>
         <label id="daysEnd" control="pop3.numDaysToLeaveOnServer" value="&daysEnd.label;"/>
       </hbox>
 
       <checkbox wsm_persist="true" id="pop3.deleteMailLeftOnServer" class="indent"
@@ -336,17 +334,17 @@
       <checkbox id="nntp.notifyOn"
                 wsm_persist="true"
                 label="&maxMessagesStart.label;"
                 accesskey="&maxMessagesStart.accesskey;"
                 oncommand="onCheckItem('nntp.maxArticles', [this.id]);"
                 prefattribute="value"
                 prefstring="mail.server.%serverkey%.notify.on"/>
       <html:input id="nntp.maxArticles" type="number"
-                  class="size4 input-inline" min="1"
+                  class="size4" min="1"
                   wsm_persist="true"
                   aria-labelledby="nntp.notifyOn nntp.maxArticles maxMessagesEnd"
                   preftype="int"
                   prefstring="mail.server.%serverkey%.max_articles"/>
       <label control="nntp.maxArticles" value="&maxMessagesEnd.label;" id="maxMessagesEnd"/>
     </hbox>
     <checkbox hidefor="pop3,imap,movemail" wsm_persist="true" id="nntp.pushAuth"
               label="&alwaysAuthenticate.label;"
--- a/mailnews/base/prefs/content/am-serverwithnoidentities.xhtml
+++ b/mailnews/base/prefs/content/am-serverwithnoidentities.xhtml
@@ -1,51 +1,50 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % accountNoIdentDTD SYSTEM "chrome://messenger/locale/am-serverwithnoidentities.dtd" >%accountNoIdentDTD;
 <!ENTITY % accountServerTopDTD SYSTEM "chrome://messenger/locale/am-server-top.dtd">%accountServerTopDTD;
 ]>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         title="&accountTitle.label;"
         onload="parent.onPanelLoaded('am-serverwithnoidentities.xhtml');">
 
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://messenger/content/am-serverwithnoidentities.js"/>
   <script src="chrome://messenger/content/amUtils.js"/>
 
+  <vbox>
   <hbox class="dialogheader">
     <label class="dialogheader-title" value="&accountTitle.label;"/>
   </hbox>
 
   <label hidden="true"
          wsm_persist="true"
          preftype="string"
          prefattribute="value"
          prefstring="mail.server.%serverkey%.storeContractID"
          genericattr="true"
          id="server.storeContractID"/>
 
   <description class="secDesc">&accountSettingsDesc.label;</description>
-  <hbox align="center" class="input-container">
+  <hbox align="center">
     <label id="server.prettyName.label" value="&accountName.label;"
            control="server.prettyName" accesskey="&accountName.accesskey;"/>
     <html:input id="server.prettyName"
                 type="text"
                 wsm_persist="true"
                 size="30"
-                class="input-inline"
                 onblur="parent.setAccountLabel(gAccount.key, null, this.value);"
                 prefstring="mail.server.%serverkey%.name"
                 aria-labelledby="server.prettyName.label"/>
   </hbox>
 
   <separator class="thin"/>
 
   <groupbox>
@@ -89,9 +88,10 @@
                   class="uri-element input-inline"
                   aria-labelledby="server.localPath.label"/>
       <button id="browseForLocalFolder" label="&browseFolder.label;"
               filepickertitle="&localFolderPicker.label;"
               accesskey="&browseFolder.accesskey;"
               oncommand="BrowseForLocalFolders()"/>
     </hbox>
   </groupbox>
+  </vbox>
 </window>
--- a/mailnews/base/prefs/content/am-smtp.xhtml
+++ b/mailnews/base/prefs/content/am-smtp.xhtml
@@ -1,15 +1,14 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-advanced.dtd">
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="&smtpServer.label;"
         onload="gSmtpServerListWindow.onLoad();">
   <script src="chrome://global/content/globalOverlay.js"/>
@@ -25,17 +24,16 @@
       <label class="dialogheader-title" value="&smtpServer.label;"/>
     </hbox>
 
     <label control="smtpList">&smtpDescription.label;</label>
     <separator class="thin"/>
 
     <hbox flex="1">
       <richlistbox id="smtpList"
-                   class="theme-listbox"
                    onselect="gSmtpServerListWindow.onSelectionChanged(event);"
                    ondblclick="gSmtpServerListWindow.onEditServer(event);"
                    seltype="single"
                    flex="1"/>
 
       <vbox>
         <button id="addButton"
                 oncommand="gSmtpServerListWindow.onAddServer(event);"
--- a/mailnews/extensions/newsblog/content/am-newsblog.xhtml
+++ b/mailnews/extensions/newsblog/content/am-newsblog.xhtml
@@ -1,16 +1,15 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger-newsblog/skin/feed-subscriptions.css" type="text/css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
 
 <!DOCTYPE window [
 <!ENTITY %         newsblogDTD SYSTEM "chrome://messenger-newsblog/locale/am-newsblog.dtd" >
 %newsblogDTD;
 <!ENTITY %             feedDTD SYSTEM "chrome://messenger-newsblog/locale/feed-subscriptions.dtd" >
 %feedDTD;
 <!ENTITY %   accountNoIdentDTD SYSTEM "chrome://messenger/locale/am-serverwithnoidentities.dtd" >
 %accountNoIdentDTD;
@@ -34,21 +33,21 @@
   <vbox flex="1" style="overflow: auto;">
 
     <hbox id="am-newsblog-title" class="dialogheader">
       <label class="dialogheader-title" defaultTitle="&accountTitle.label;"/>
     </hbox>
 
     <description class="secDesc">&accountSettingsDesc.label;</description>
 
-    <hbox align="center" class="input-container">
+    <hbox align="center">
       <label id="server.prettyNameLabel" value="&accountName.label;"
              accesskey="&accountName.accesskey;"
              control="server.prettyName"/>
-      <html:input id="server.prettyName" type="text" class="input-inline"
+      <html:input id="server.prettyName" type="text"
                   wsm_persist="true"
                   size="30"
                   aria-labelled-by="server.prettyNameLabel"
                   onblur="parent.setAccountLabel(gAccount.key, null, this.value);"
                   prefstring="mail.server.%serverkey%.name"/>
     </hbox>
 
     <separator class="thin"/>
@@ -132,17 +131,17 @@
                 prefstring="mail.server.%serverkey%.empty_trash_on_exit"/>
 
       <separator class="thin"/>
 
       <vbox>
         <label id="server.localPathLabel" value="&localPath.label;" control="server.localPath"/>
         <hbox align="center" class="input-container">
           <html:input id="server.localPath" type="text" readonly="readonly"
-                      class="uri-element input-filefield"
+                      class="uri-element input-inline"
                       aria-labelledby="server.localPathLabel"
                       wsm_persist="true"
                       datatype="nsIFile"
                       prefstring="mail.server.%serverkey%.directory"/>
           <button id="browseForLocalFolder"
                   label="&browseFolder.label;"
                   filepickertitle="&localFolderPicker.label;"
                   accesskey="&browseFolder.accesskey;"
--- a/mailnews/extensions/smime/content/am-smime.inc.xhtml
+++ b/mailnews/extensions/smime/content/am-smime.inc.xhtml
@@ -81,18 +81,20 @@
 
           <radio id="encrypt_mail_always" wsm_persist="true" value="2"
                  label="&alwaysEncryptMessage.label;"
                  accesskey="&alwaysEncryptMessage.accesskey;"/>
         </radiogroup>
       </groupbox>
 
       <!-- Certificate manager -->
-      <groupbox id="smimeCertificateManager" orient="horizontal">
+      <groupbox id="smimeCertificateManager">
         <label class="header">&certificates.label;</label>
-        <button id="openCertManagerButton" oncommand="openCertManager();"
-                label="&manageCerts2.label;" accesskey="&manageCerts2.accesskey;"
-                prefstring="security.disable_button.openCertManager"/>
-        <button id="openDeviceManagerButton" oncommand="openDeviceManager();"
-                label="&manageDevices.label;" accesskey="&manageDevices.accesskey;"
-                prefstring="security.disable_button.openDeviceManager"/>
+        <hbox>
+          <button id="openCertManagerButton" oncommand="openCertManager();"
+                  label="&manageCerts2.label;" accesskey="&manageCerts2.accesskey;"
+                  prefstring="security.disable_button.openCertManager"/>
+          <button id="openDeviceManagerButton" oncommand="openDeviceManager();"
+                  label="&manageDevices.label;" accesskey="&manageDevices.accesskey;"
+                  prefstring="security.disable_button.openDeviceManager"/>
+        </hbox>
       </groupbox>
     </vbox>
--- a/mailnews/extensions/smime/content/am-smime.xhtml
+++ b/mailnews/extensions/smime/content/am-smime.xhtml
@@ -1,15 +1,14 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-smime.dtd">
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         class="color-dialog"
         onload="parent.onPanelLoaded('am-smime.xhtml');">
 
   <script src="chrome://global/content/globalOverlay.js"/>