From 3008412a3cfb2939048d3520e608ecb07b58535e Mon Sep 17 00:00:00 2001
From: "ben%netscape.com" <ben%netscape.com>
Date: Sat, 12 Aug 2000 09:27:10 +0000
Subject: [PATCH] 46613, classic skin polish

---
 xpfe/components/sidebar/resources/customize.xul      | 8 ++++----
 xpfe/components/sidebar/resources/sidebarOverlay.css | 2 +-
 xpfe/components/sidebar/resources/sidebarOverlay.xul | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/xpfe/components/sidebar/resources/customize.xul b/xpfe/components/sidebar/resources/customize.xul
index 907786105449..e61bcc87ca70 100644
--- a/xpfe/components/sidebar/resources/customize.xul
+++ b/xpfe/components/sidebar/resources/customize.xul
@@ -31,7 +31,7 @@
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onload="Init();" 
   id="main-window"
-  class="color-dialog"
+  class="dialog"
   title="&sidebar.customize.title.label;"
   windowtype="sidebar:customize"
   orient="vertical"
@@ -42,9 +42,7 @@
 
   <keyset id="keyset"/>
 
-  <box class="box-header" id="header" value="&sidebar.customize.title.label;"/>
-
-  <box id="contentarea" flex="1">
+  <box flex="1">
     <box orient="vertical" flex="5">
       <text class="label" value="&sidebar.customize.additional.label;"
         crop="right"/>
@@ -172,6 +170,8 @@
 
   </box>
 
+  <separator class="thin"/>
+
   <box id="okCancelButtonsRight" />
 
 </window>
diff --git a/xpfe/components/sidebar/resources/sidebarOverlay.css b/xpfe/components/sidebar/resources/sidebarOverlay.css
index f45b120e0f2e..e4ffe8eb6141 100644
--- a/xpfe/components/sidebar/resources/sidebarOverlay.css
+++ b/xpfe/components/sidebar/resources/sidebarOverlay.css
@@ -50,7 +50,7 @@
 /*
  *    Sidebar and Panel title buttons
  */
-sidebarheader {
+sidebarheader[type="box"] {
     behavior: url(chrome://communicator/content/sidebar/sidebarBindings.xml#sidebar-header-box);
 }
 sidebarheader[type="splitter"] {
diff --git a/xpfe/components/sidebar/resources/sidebarOverlay.xul b/xpfe/components/sidebar/resources/sidebarOverlay.xul
index 332d169a2539..c29d2987bcc1 100644
--- a/xpfe/components/sidebar/resources/sidebarOverlay.xul
+++ b/xpfe/components/sidebar/resources/sidebarOverlay.xul
@@ -30,9 +30,9 @@
   <box id="sidebar-box" align="vertical"
     persist="hidden width collapsed">
     <sidebarheader id="sidebar-title-box" class="sidebarheader-main"
-      value="&sidebar.panels.label;" persist="hidden state"
+      value="&sidebar.panels.label;" persist="hidden state" type="box"
       collapse="after" onmouseup="PersistHeight();">
-      <menu id="sidebar-panel-picker" class="standard" crop="right"
+      <menubutton id="sidebar-panel-picker" menubuttontype="sidebar-panels" class="button-toolbar-4" crop="right"
         oncreate="SidebarBuildPickerPopup();"
         value="&sidebar.picker.label;" >
         <menupopup id="sidebar-panel-picker-popup" popupanchor="topright"
@@ -66,7 +66,7 @@
             oncommand="SidebarCustomize();" />
           <menuseparator />
         </menupopup>
-      </menu>
+      </menubutton>
     </sidebarheader>
 
     <box id="sidebar-panels" align="vertical"