Component bar in statusbar is flat and messed up in win classic (80434). r=kerz sr=ben

editor/ui/composer/content/editor.xul

@@ -255,10 +255,9 @@
 
     <!-- Some of this is from globarOverlay.xul -->
     <statusbar id="status-bar">
-      <box id="component-bar" class="component-bar-box"/>
-      <statusbarpanel class="statusbarpanel-icononly" id="offline-status"/>
-
+      <box id="component-bar"/>
       <statusbarpanel id="statusText" label="&statusText.label;" flex="1" crop="right"/>
+      <statusbarpanel class="statusbarpanel-icononly" id="offline-status"/>
       <resizer class="window-diagonal" />
     </statusbar>
     

mailnews/addrbook/resources/content/addressbook.xul

@@ -268,11 +268,10 @@ Rights Reserved.
  
   </box>
   
-         <statusbar id="status-bar" >
-           <box id="component-bar" class="component-bar-box"/>
-           <statusbarpanel id="offline-status" class="statusbarpanel-icononly"/>
-           <statusbarpanel id="statusText" class="status-bar" flex="1" value="&statusText.label;"/>  
-           
-           <resizer class="window-diagonal"/>
-         </statusbar>  
+  <statusbar id="status-bar" >
+    <box id="component-bar"/>
+    <statusbarpanel id="statusText" class="status-bar" flex="1" value="&statusText.label;"/>  
+    <statusbarpanel id="offline-status" class="statusbarpanel-icononly"/>           
+    <resizer class="window-diagonal"/>
+  </statusbar>  
 </window>

mailnews/base/resources/content/mailTasksOverlay.xul

@@ -58,7 +58,7 @@
   </commandset>
   
 
-  <box id="component-bar">
+  <box id="component-bar" class="statusbar-panel" persist="collapsed">
     <button class="button-toolbar-4 taskbutton" id="mini-mail" oncommand="toMessengerWindow()" 
             position="2" tooltip="aTooltip" tooltiptext="&taskMessenger.tooltip;"/>
   </box>

mailnews/base/resources/content/mailWindowOverlay.xul

@@ -1291,13 +1291,13 @@ Rights Reserved.
 
 <statusbar id="status-bar"> 
   <box insertbefore="unreadMessageCount" flex="1">
-    <box id="component-bar" class="component-bar-box"/>
-    <statusbarpanel id="offline-status" class="statusbarpanel-icononly"/> 
+    <box id="component-bar"/>
     <statusbarpanel id="statusText" label="&statusText.label;" crop="right" flex="1"/> 
     <progressmeter class="progressmeter-statusbar" statusbar="true" id="statusbar-icon" mode="normal" value="0" oncommand="dumpProgress()"/> 
   </box>
   <box insertafter="totalMessageCount">
-      <statusbarpanel id="security-button" class="statusbarpanel-icononly"/>
+    <statusbarpanel id="offline-status" class="statusbarpanel-icononly"/> 
+    <statusbarpanel id="security-button" class="statusbarpanel-icononly"/>
 	  <resizer class="window-diagonal"/>
   </box>
 </statusbar> 

mailnews/compose/resources/content/messengercompose.xul

@@ -508,12 +508,11 @@
   </box>
 
   <statusbar id="status-bar">
-    <box id="component-bar" class="component-bar-box"/>
-    <statusbarpanel id="offline-status" class="statusbarpanel-icononly" onclick="setTimeout('UpdateOfflineState()', 0)"/> 
+    <box id="component-bar"/>
     <statusbarpanel id="statusText" flex="1" label="&defaultStatusText.label;"/>
-
     <progressmeter id="progressmeter" class="progressmeter-statusbar" 
                    mode="normal" value="0" statusbar="true"/>
+    <statusbarpanel id="offline-status" class="statusbarpanel-icononly" onclick="setTimeout('UpdateOfflineState()', 0)"/> 
     <resizer class="window-diagonal"/>
   </statusbar>
 

themes/classic/communicator/win/tasksOverlay.css

@@ -67,14 +67,4 @@
 /* hide goto menu bug #47633 */ 
 #taskbarGotoMenuBox{
 	display:none;	
-}   
-
-
-/* ::::: component bar ::::: */
-
-
-
-#component-bar {
-	margin-right: 20px;
-	
-} 
+}   

themes/classic/global/win/global.css

@@ -185,7 +185,7 @@
       min-width           : 1px;
     }
   
-  statusbarpanel 
+  statusbarpanel, .statusbar-panel
     {
       border-left         : 1px solid ThreeDHighlight;
       border-top          : 1px solid ThreeDHighlight;
@@ -202,7 +202,7 @@
   .statusbar-panel-icon
     {
       list-style-image    : inherit;
-    }    
+    }      
 
 /**
  * iframe default sizing 

xpfe/browser/resources/content/navigator.xul

@@ -329,14 +329,14 @@ Contributor(s): ______________________________________. -->
    </hbox>
      
       <statusbar id="status-bar" class="chromeclass-status">
-        <box id="component-bar" class="component-bar-box"/>
-        <statusbarpanel class="statusbarpanel-icononly" id="offline-status"/>
+        <box id="component-bar"/>
         <statusbarpanel id="statusbar-display" label="&statusText.label;" crop="right" flex="1"/>
         <progressmeter class="progressmeter-statusbar" statusbar="true" id="statusbar-icon" mode="normal" value="0"/>
+        <statusbarpanel class="statusbarpanel-icononly" id="offline-status"/>
         <statusbarpanel class="statusbarpanel-icononly" id="security-button"/>
       </statusbar> 
        
-      <resizer class="window-diagonal" />
+      <resizer class="window-diagonal"/>
       
 
 

xpfe/communicator/resources/content/tasksOverlay.xul

@@ -100,7 +100,7 @@
   </box>
   -->
   
-  <box id="component-bar" class="statusbarpanel-icononly" persist="collapsed">
+  <box id="component-bar" class="statusbar-panel" persist="collapsed">
 
        <button class="button-toolbar-4 taskbutton" id="mini-nav" oncommand="toNavigator();" 
               tooltip="aTooltip" tooltiptext="&taskNavigator.tooltip;"/>

xpfe/communicator/resources/locale/en-US/utilityOverlay.dtd

@@ -53,7 +53,7 @@
 <!ENTITY viewMenu.accesskey				"v"> 
 <!ENTITY viewToolbarsMenu.label				"Toolbars"> 
 <!ENTITY viewToolbarsMenu.accesskey			"t"> 
-<!ENTITY showTaskbarCmd.label					"Statusbar">  
+<!ENTITY showTaskbarCmd.label					"Status Bar">  
 <!ENTITY showTaskbarCmd.accesskey				"s"> 
 
 <!ENTITY helpMenu.label					"Help">