From 19121c40bd0b91b1f6480906c084c52f12e2dacd Mon Sep 17 00:00:00 2001
From: "alecf%netscape.com" <alecf%netscape.com>
Date: Fri, 20 Aug 1999 07:20:03 +0000
Subject: [PATCH] minor cleanup to make the account manager look better

---
 .../base/prefs/resources/content/am-advanced.xul | 16 ++++++++--------
 .../base/prefs/resources/content/am-copies.xul   | 10 +++++-----
 .../base/prefs/resources/content/am-main.xul     |  3 +--
 .../prefs/resources/content/am-server-pop3.xul   |  8 +++-----
 .../prefs/resources/content/am-server-top.xul    | 15 ++++++---------
 5 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/mailnews/base/prefs/resources/content/am-advanced.xul b/mailnews/base/prefs/resources/content/am-advanced.xul
index c4b46ee113c..629a2cc408f 100644
--- a/mailnews/base/prefs/resources/content/am-advanced.xul
+++ b/mailnews/base/prefs/resources/content/am-advanced.xul
@@ -3,14 +3,14 @@
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-advanced.dtd" >
-<xul:window xmlns:html="http://www.w3.org/TR/REC-html40"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      style="width: 100%"
-      onload = "">
 
-<box align="vertical" style="width: 100%">
+<window xmlns:html="http://www.w3.org/TR/REC-html40"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      align="vertical">
+
 <html:div>&advancedSettings.label;</html:div>
-  <html:div>&smtpServer.label;</html:div>
+<html:div>&smtpServer.label;</html:div>
+
 <box align="vertical" class="cleanborder">
   <html:div>&smtpDesc.label;</html:div>
   <box align="horizontal">
@@ -33,5 +33,5 @@
     <titledbutton value="&chooseFolderButton.label;"/>
   </box>
 </box>
-</box>
-</xul:window>
+
+</window>
diff --git a/mailnews/base/prefs/resources/content/am-copies.xul b/mailnews/base/prefs/resources/content/am-copies.xul
index ad8fac98dae..aab44c23055 100644
--- a/mailnews/base/prefs/resources/content/am-copies.xul
+++ b/mailnews/base/prefs/resources/content/am-copies.xul
@@ -3,11 +3,11 @@
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-copies.dtd" >
-<xul:window xmlns:html="http://www.w3.org/TR/REC-html40"
+<window xmlns:html="http://www.w3.org/TR/REC-html40"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload = "">
+      align="vertical">
+
 
-<box align="vertical" flex="100%" style="height: 100%; width: 100%;">
 <html:div>&copyAndFolderTitle.label;</html:div>
 <box align="vertical" class="cleanborder" flex="100%">
 <html:div>&sendingPrefix.label;</html:div>
@@ -47,5 +47,5 @@
     <html:button type="button">&chooseFolderButton.label;</html:button>
   </box>
 </box>
-</box>
-</xul:window>
+
+</window>
diff --git a/mailnews/base/prefs/resources/content/am-main.xul b/mailnews/base/prefs/resources/content/am-main.xul
index 61b07fc4c6b..1d77fadd8d2 100644
--- a/mailnews/base/prefs/resources/content/am-main.xul
+++ b/mailnews/base/prefs/resources/content/am-main.xul
@@ -7,11 +7,10 @@
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-     style="height:100%; width:100%"
      align="vertical"> 
      
-    <html:div>&accountTitle.label;</html:div>
 
+    <html:div>&accountTitle.label;</html:div>
     <box align="vertical" flex="100%" class="cleanborder">
     <box align="horizontal">
       <spring flex="100%"/>
diff --git a/mailnews/base/prefs/resources/content/am-server-pop3.xul b/mailnews/base/prefs/resources/content/am-server-pop3.xul
index 2223e08bc72..5c3ebf8d06a 100644
--- a/mailnews/base/prefs/resources/content/am-server-pop3.xul
+++ b/mailnews/base/prefs/resources/content/am-server-pop3.xul
@@ -6,11 +6,10 @@
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      style="width: 100%; height=100%"
+      align="vertical"
       onload = "">
 
-<box align="vertical" style="width: 100%">
-<box align="vertical" class="cleanborder" flex="100%" style="width: 100%; height: 100%;">
+<box align="vertical" class="cleanborder" flex="100%">
   <box align="horizontal">
     <spring flex="100%"/>
     <html:div>&hostname.label;</html:div>
@@ -27,11 +26,10 @@
   <html:div><html:input type="checkbox"/>&biffStart.label;
             <html:spacer/>
             <html:input type="text" size="3"/>
-            <html:spacer/>&biffEnd.label;`
+            <html:spacer/>&biffEnd.label;
   </html:div>
   <html:div><html:input type="checkbox"/>&leaveOnServer.label;</html:div>
   <html:div><html:input type="checkbox"/>&deleteOnServer.label;</html:div>
   <html:div><html:input type="checkbox"/>&emptyTrashOnExit.label;</html:div>
 </box>
-</box>
 </window>
diff --git a/mailnews/base/prefs/resources/content/am-server-top.xul b/mailnews/base/prefs/resources/content/am-server-top.xul
index 8167b2f9df3..092331f1788 100644
--- a/mailnews/base/prefs/resources/content/am-server-top.xul
+++ b/mailnews/base/prefs/resources/content/am-server-top.xul
@@ -4,14 +4,12 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-server-top.dtd" >
 
-<xul:window xmlns:html="http://www.w3.org/TR/REC-html40"
+<window xmlns:html="http://www.w3.org/TR/REC-html40"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      style="width: 100%; height: 100%"
-      onload = "">
-<box align="vertical" style="width: 100%; height=100%">
-<box align="vertical" class="cleanborder" flex="100%"
-    style="width: 100%; height: 100%">
+      align="vertical">
+
   <html:div>&serverSettings.label;</html:div>
+  <box align="vertical" class="cleanborder" flex="100%">
   <html:div>
     <spring flex="100%"/>
     Account Type
@@ -22,6 +20,5 @@
       <html:option name="webmail">&webmail.label;</html:option>
     </html:select>
   </html:div>
-</box>
-</box>
-</xul:window>
+  </box>
+</window>