74641 - new modern theme, r=andreww, sr=hyatt

themes/modern/communicator/bookmarks/bookmarks.css

@@ -14,7 +14,7 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):

themes/modern/communicator/bookmarks/bookmarksToolbar.css

@@ -23,7 +23,11 @@
  *
  */
 
-@import url(chrome://communicator/skin/bookmarks/bookmarks.css);
+/* ===== bookmarksToolbar.css ===========================================
+  == Styles specific to bookmark items in a toolbar.
+  ======================================================================= */
+
+@import url("chrome://communicator/skin/bookmarks/bookmarks.css");
 
 /* ::::: bookmark toolbar buttons ::::: */
 
@@ -39,17 +43,32 @@
 .bookmark-item.button-toolbar:hover,
 .bookmark-item.button-toolbar:hover:active,
 .bookmark-item.button-toolbar[open="true"] {
-  background-color: transparent;
+  border: 1px solid transparent;
 }
 
 .bookmark-item.button-toolbar[container="true"] {
-  -moz-binding: url("chrome://global/content/menulistBindings.xml#menubutton-single-left");
+  -moz-binding: url("chrome://communicator/skin/widgetBindings.xml#menubutton-toolbar-single-ile");
 }
 
 .bookmark-item.button-toolbar[container="true"],
 .bookmark-item.button-toolbar[container="true"]:hover {
   cursor: default;
   text-decoration: none;
-  -moz-binding: url("chrome://communicator/skin/widgetBindings.xml#menubutton-toolbar-single-ile");
 }
 
+/* make folders look like normal toolbar buttons */
+
+.bookmark-item.button-toolbar[container="true"]:hover {
+  border-top: 1px solid #D5DAE5;
+  border-right: 1px solid #7681A2;
+  border-bottom: 1px solid #7681A2;
+  border-left: 1px solid #D5DAE5;
+}
+
+.bookmark-item.button-toolbar[container="true"]:hover:active,
+.bookmark-item.button-toolbar[container="true"][open="true"] {
+  border-top: 1px solid #7681A2;
+  border-right: 1px solid #D5DAE5;
+  border-bottom: 1px solid #D5DAE5;
+  border-left: 1px solid #7681A2;
+}

themes/modern/communicator/bookmarks/bookmarksWindow.css

@@ -23,6 +23,10 @@
  *
  */
 
+/* ===== bookmarksWindow.css ============================================
+  == Styles specific to the Bookmarks Manager window.
+  ======================================================================= */
+
 @import url(chrome://communicator/skin/bookmarks/bookmarks.css);
 
 #navprintplus {

themes/modern/communicator/brand.css

@@ -14,11 +14,11 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
+ *
  */
 
 /* ==== brand.css ===========================================================
@@ -31,39 +31,21 @@
   -moz-binding: url("chrome://communicator/skin/brand/brandBindings.xml#throbber");
   -moz-user-focus: ignore !important;
   cursor: pointer;
-  margin: 4px 1px 0px 8px;
-  border: none;
+  margin: 5px 12px 0px 0px;
+  border-top: 1px solid #B9BFC7;
+  border-right: 1px solid #A1AAB3;
+  border-bottom: 1px solid #DEE7EE;
+  border-left: 1px solid #A4ACB5;
   min-width: 0px;
-  list-style-image: url("chrome://communicator/skin/brand/throbber-single.gif");
+  list-style-image: url("chrome://communicator/skin/brand/throbber25-single.gif");
 }
 
 #navigator-throbber[busy="true"] {
-  list-style-image: url("chrome://communicator/skin/brand/throbber-anim.gif");
+  list-style-image: url("chrome://communicator/skin/brand/throbber25-anim.gif");
 }
 
-.throbber-icon {
-  background-color: #637D94;
-}
-
-.throbber-groove-left {
-  width: 2px;
-  height: 36px;
-  background: url("chrome://communicator/skin/brand/throbber-groove-lft.gif") no-repeat;
-}
-
-.throbber-groove-right {
-  width: 2px;
-  height: 36px;
-  background: url("chrome://communicator/skin/brand/throbber-groove-rit.gif") no-repeat;
-}
-
-.throbber-groove-top {
-  height: 2px;
-  background: url("chrome://communicator/skin/brand/throbber-groove-top.gif") repeat-x;
-}
-
-.throbber-groove-bottom {
-  height: 2px;
-  background: url("chrome://communicator/skin/brand/throbber-groove-btm.gif") repeat-x;
+#throbber-box,
+.throbber-internal-box {
+  vertical-align: top !important;
 }  
 

themes/modern/communicator/brand/brandBindings.xml

@@ -1,18 +1,26 @@
 <?xml version="1.0"?>
 
-<bindings id="brandBindings"
+<bindings id="communicatorBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <binding id="throbber" extends="chrome://global/content/xulBindings.xml#basetext">
-    <content>
-      <xul:spring class="throbber-groove-left"/>
-      <xul:box flex="1" class="throbber-middle" orient="vertical">
-        <xul:spring class="throbber-groove-top"/>
-        <xul:image flex="1" class="throbber-icon" inherits="src" autostretch="never"/>
-        <xul:spring class="throbber-groove-bottom"/>
-      </xul:box>
-      <xul:spring class="throbber-groove-right"/>
+  	<content>
+      <xul:image class="throbber-icon" inherits="src" autostretch="never"/>
+    </content>
+  </binding>
+
+  <binding id="throbber-fancy" extends="chrome://global/content/xulBindings.xml#basetext">
+  	<content>
+      <xul:vbox class="throbber-internal-box" flex="1">
+       	<xul:spring class="throbber-groove-top"/>
+    	  <xul:hbox class="throbber-middle">
+      	  <xul:spring class="throbber-groove-left"/>
+    	  	<xul:image class="throbber-icon" inherits="src" autostretch="never"/>
+    	  	<xul:spring class="throbber-groove-right"/>
+    	  </xul:hbox>
+    	  <xul:spring class="throbber-groove-bottom"/>
+      </xul:vbox>
     </content>
   </binding>
 

themes/modern/communicator/button.css

@@ -14,11 +14,11 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
+ *
  */
 
 /* ==== button.css ==========================================================
@@ -32,52 +32,72 @@
 .button-toolbar {
   -moz-binding: url("chrome://global/content/xulBindings.xml#buttonleft");
   -moz-user-focus: ignore;
-  margin: 1px;
-  border: none;
-  height: 0px;
+  margin: 0px;
+  border: 1px solid transparent;
   min-width: 0px;
   max-width: 10em;
-  color: #FFFFFF;
+  height: 0px;
+  color: inherit;
   font: message-box;
 }
  
-.button-toolbar > .button-internal-box,
-.button-toolbar[disabled="true"]:hover:active > .button-internal-box,
-.button-toolbar[toggled="true"]:hover:active > .button-internal-box {
-  padding: 1px 2px 1px 2px;
+.button-internal-box {
   vertical-align: middle;
 }
     
-.button-toolbar[label] > .button-internal-box > .button-icon {
-  margin-right: 2px;
+.button-toolbar > .button-internal-box > .button-icon {
+  margin: 0px;
+  padding: 0px 2px 0px 0px;
+}
+    
+.button-toolbar > .button-internal-box > .button-text-container,
+.button-toolbar > .button-internal-box > .button-text-container > .button-text {
+  margin: 0px;
+  padding: 0px;
+}
+
+.button-toolbar > .button-internal-box,
+.button-toolbar:hover > .button-internal-box,
+.button-toolbar[disabled="true"] > .button-internal-box,
+.button-toolbar[disabled="true"]:hover > .button-internal-box,
+.button-toolbar[disabled="true"]:hover:active > .button-internal-box,
+.button-toolbar:hover:active[home-dragover="true"] > .button-internal-box {
+  padding: 1px 2px 1px 2px;
+  border: none;
 }
     
 .button-toolbar:hover {
-  background-color: #6684A5;
+  border-top: 1px solid #D5E0E8;
+  border-right: 1px solid #A4AFBB;
+  border-bottom: 1px solid #A4AFBB;
+  border-left: 1px solid #D5E0E8;
 }
   
 .button-toolbar:hover:active,
-.button-toolbar[open="true"], /* for menubuttons */
-.button-toolbar[home-dragover="true"] {
-  background-color: #455A70;
-  color: #9DB8C1;
+.button-toolbar[open="true"],
+.button-toolbar[toggled="true"], 
+.button-toolbar[toggled="true"]:hover,
+.button-toolbar[toggled="true"]:hover:active {
+  border-top: 1px solid #7681A2;
+  border-right: 1px solid #D5DAE5;
+  border-bottom: 1px solid #D5DAE5;
+  border-left: 1px solid #7681A2;
+  color: inherit;
 }
 
 .button-toolbar:hover:active > .button-internal-box {
   padding: 2px 1px 0px 3px;
 }
 
-.button-toolbar:hover:active[home-dragover="true"]
-  > .button-internal-box
-{
-  padding: 1px 2px 1px 2px;
+.button-toolbar[home-dragover="true"] {
+  border: 1px solid #ffffff;
 }
     
 .button-toolbar[disabled="true"],
 .button-toolbar[disabled="true"]:hover,
 .button-toolbar[disabled="true"]:hover:active {
-  background-color: transparent;
-  color: #D0E7E7;
+  border: none;
+  color: #999999;
 }
 
 /* ..... toggled state ..... */
@@ -85,8 +105,7 @@
 .button-toolbar[toggled="true"],
 .button-toolbar[toggled="true"]:hover,
 .button-toolbar[toggled="true"]:hover:active {
-  background-color: #455A70;
-  color: #9DB8C1;
+  background-color: #D1D5E4;
 }
 
 /* ::::: standard toolbar buttons on a tabpanels ::::: */
@@ -106,8 +125,8 @@
   border: 1px solid transparent;
 }
 
-.button-toolbar.tabpanels:hover {
-  border: 1px outset #C2D0D0;
+.button-toolbar.tabpanel:hover {
+  border: 1px outset #BBBBBB;
 }
 
 .button-toolbar.tabpanels:hover:active {
@@ -122,16 +141,19 @@
   margin: 3px 2px 0px 2px;
   border: none;
   min-width: 0px;
+  font: message-box;
   font-size: smaller;
   text-align: center;
 }
     
 .button-toolbar-1,
-.button-toolbar-1:hover:active,
+.button-toolbar-1:hover:active {
+  color: inherit;
+}
+
 .button-toolbar-1[disabled="true"],
-.button-toolbar-1[disabled="true"]:hover,
 .button-toolbar-1[disabled="true"]:hover:active {
-  color: #D0E7E7;
+  color: #5A5E5F;
 }
     
 /* :::::
@@ -141,30 +163,29 @@
    ::::: */
 
 .button-toolbar-2 {
-  -moz-binding: url("chrome://communicator/skin/widgetBindings.xml#button-doubletext");
+  -moz-binding: url("chrome://communicator/skin/widgetBindings.xml#button-toolbar-2");
   -moz-user-focus: ignore;
-  margin: 3px 3px 1px 3px;
+  margin: 0px;
   border: none;
-  min-width: 52px;
+  min-width: 0px;
+  font: message-box;
   font-size: smaller;
-  text-align: center;
 }
     
 .button-toolbar-2,
-.button-toolbar-2:hover:active,
+.button-toolbar-2:hover,
+.button-toolbar-2:hover:active {
+  color: #323642;
+}
+    
+.button-toolbar-2 > .button-internal-box > .button-icon-box {
+  text-align: center;
+}
+
 .button-toolbar-2[disabled="true"],
 .button-toolbar-2[disabled="true"]:hover,
 .button-toolbar-2[disabled="true"]:hover:active {
-  color: #D0E7E7;
-}
-
-.button-text-shadow {
-  margin: 1px 0px 0px 1px;
-  color: #394B6E !important;
-}
-
-.button-text[disabled="true"] {
-  display: none;
+  color: #9399AB;
 }
 
 /* :::::
@@ -173,35 +194,45 @@
 
 .button-toolbar-3 {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#nine-slice-button");
-  -moz-user-focus: ignore;
-  margin: 2px;
+  -moz-user-focus: ignore !important;
+  margin: 0px;
   border: none;
-  height: 22px;
-  font-weight: bold;
 }
 
 /* ::::: button styles for taskbar, sidebar headers, etc. ::::: */
 
 .button-toolbar-4 {
   -moz-binding: url("chrome://global/content/xulBindings.xml#buttonleft");
-  -moz-user-focus: ignore;
+  -moz-user-focus: ignore !important;
   margin: 0px;
-  border: none;
+  border: 0px;
   padding: 1px;
-  height: 1px;
   min-width: 0px;
-  background: inherit;
-  color: #D0E7E7;
-  font: inherit;
+  background: transparent;
+  color: inherit;
+  font: message-box;
+}
+
+.button-toolbar-4 > .button-internal-box,
+.button-toolbar-4 > .menubutton-internal-box {
+  border: 0px !important;
+  padding: 0px !important;
 } 
 
 .button-toolbar-4:hover:active {
-  color: #CCFFFF;
+  color: #808080;
 }
 
-.button-toolbar-4 > .button-internal-box {
-  border: 0px;
-  padding: 0px;
+/* :::::::::: menubutton variation :::::::::: */
+  
+menubutton.button-toolbar-4 {
+  -moz-binding: url("chrome://global/content/menulistBindings.xml#menubutton-single-right") !important;
+  margin: 0px 6px;
+  min-width: 0px;
+}
+
+.button-toolbar-4 > .menubutton-internal-box > .menubutton-single-icon {
+  list-style-image: url("chrome://communicator/skin/toolbar/mb-single-arrow.gif");
 }
 
 /* ::::: shared text wrapping frame ::::: */
@@ -211,6 +242,10 @@
   vertical-align: middle;
 }
 
+.button-text {
+  padding: 0px 2px 0px 2px;
+}
+  
 /* ::::: ok/cancel buttons in dialogs ::::: */
 
 .exit-dialog {

themes/modern/communicator/communicator.css

@@ -14,11 +14,11 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
+ *
  */
 
 /* ==== communicator.css ====================================================

themes/modern/communicator/dialog/dialogBindings.xml

@@ -4,21 +4,6 @@
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
- <binding id="largeheader" extends="xul:box">
-    <content>
-      <xul:box class="largeheader-box" flex="1">
-        <xul:box class="largeheader-text-container" orient="vertical">
-          <xul:text class="largeheader-header-text" inherits="value=title" crop="right"/>
-          <xul:html class="largeheader-desc-text" inherits="value=description"/>
-        </xul:box>
-        <xul:spring flex="1"/>
-        <xul:box class="largeheader-icon-container" autostretch="never">
-          <xul:image class="largeheader-icon" inherits="src"/>
-        </xul:box>
-      </xul:box>
-    </content>
-  </binding>
-  
   <binding id="smallheader" extends="chrome://communicator/content/dialogBindings.xml#smallheader">
     <content>
       <xul:box class="box-smallheader-text-container" autostretch="never" flex="1">
@@ -29,4 +14,21 @@
     </content>
   </binding>
   
+ <binding id="largeheader" extends="xul:box">
+    <content>
+      <xul:box class="largeheader-box" flex="1">
+        <xul:box class="largeheader-text-container" orient="vertical">
+          <xul:spring flex="1"/>
+          <xul:text class="largeheader-header-text" inherits="value=title" crop="right"/>
+          <xul:html class="largeheader-desc-text" inherits="value=description"/>
+          <xul:spring flex="1"/>
+        </xul:box>
+        <xul:spring flex="1"/>
+        <xul:box class="largeheader-icon-container" autostretch="never">
+          <xul:image class="largeheader-icon" inherits="src"/>
+        </xul:box>
+      </xul:box>
+    </content>
+  </binding>
+  
 </bindings>

themes/modern/communicator/dialogOverlay.css

@@ -14,11 +14,11 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
+ *
  */
 
 /* ===== dialogOverlay.css ==============================================
@@ -31,19 +31,20 @@
 
 .box-header {
   -moz-binding: url("chrome://communicator/skin/dialog/dialogBindings.xml#largeheader");
+}
+
+.largeheader-box {
+  padding-top: 10px;
+  padding-bottom: 10px;
+  border-top: 1px solid #94AACE;
+  border-bottom: 1px solid #000000;
   background-color: #5B7693;
   color: #ffffff;
 }  
   
-.largeheader-box {
-  padding: 10px 0px 10px 0px;
-  border-top: 1px solid #94AACE;
-  border-bottom: 1px solid #000000;
-}
-
 .largeheader-header-text {
-  margin-left: 23px;
   font-weight: bold;
+  margin-left: 23px;
 }
 
 .largeheader-desc-text {
@@ -54,20 +55,25 @@
  
 .box-smallheader {
   -moz-binding: url("chrome://communicator/skin/dialog/dialogBindings.xml#smallheader");
-  margin: 0px 5px 5px 8px;
-  border: 1px inset #B4C3D4;
-  background: url("chrome://communicator/skin/dialog/smallheader-bg.gif") repeat-x;
+  margin: 0px 5px 5px 5px;
+  border: 1px inset #C7D0D9;
+  background-color: #C7D0D9;
   color: #000000;
 }
 
 .box-smallheader-text-container {
-  border: 1px solid #000000;
-  padding: 5px 8px 5px 8px;
+  border: 1px solid #2D3B49;
+  padding: 5px 0px 5px 8px;
 }
 
 .box-smallheader-left {
   font-size: larger;
   font-weight: bold;
+  padding-left: 0px;
+}
+
+.box-smallheader-right {
+  padding-right: 0px;
 }
 
 /* ::::: dialog statusbar ::::: */
@@ -78,8 +84,7 @@
 
 .box-status-bg {
   padding: 1px 5px 1px 5px;
-  background-color: #394B6E;
-  color: #99cccc;
+  min-height: 0px ! important;
 }
   
 /* ::::: content and button boxes ::::: */
@@ -90,5 +95,3 @@
   padding: 7px;
 }
 
-
-

themes/modern/communicator/directory/directory.css

@@ -14,11 +14,11 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
+ *
  */
 
 /* ===== directory.css ==================================================

themes/modern/communicator/formatting.css

@@ -14,11 +14,11 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
+ *
  */
 
 /* ==== formatting.css ==================================================

themes/modern/communicator/menubutton.css

@@ -33,11 +33,6 @@ menubutton.button-toolbar {
   -moz-binding: url("chrome://communicator/skin/widgetBindings.xml#menubutton-toolbar-single");
 }
 
-.button-toolbar > .menubutton-toolbar-single-internal-box
-  {
-    vertical-align: middle;
-  }
-
 .menubutton-internal-box,
 .button-toolbar[disabled="true"]:hover > .menubutton-internal-box,
 .button-toolbar-4[disabled="true"]:hover > .menubutton-internal-box,
@@ -47,6 +42,7 @@ menubutton.button-toolbar {
   border: none;
   padding: 1px 3px 1px 3px;
   background-color: transparent;
+  vertical-align: middle;
 }
 
 .button-toolbar > .menubutton-internal-box > .menubutton-single-icon {
@@ -86,19 +82,18 @@ menubutton.button-toolbar {
 /* ::::: single toolbar menubuttons ::::: */
 
 menubutton.button-toolbar-2.top {
-  -moz-binding: url("chrome://communicator/skin/widgetBindings.xml#button-doubletext");
+  -moz-binding: url("chrome://communicator/skin/widgetBindings.xml#button-toolbar-2");
 }
 
 menubutton.button-toolbar-2.bottom {
-  -moz-binding: url("chrome://communicator/skin/widgetBindings.xml#button-doubletext");
+  -moz-binding: url("chrome://communicator/skin/widgetBindings.xml#button-toolbar-2");
 }
 
 /* ::::: dual toolbar menubuttons ::::: */
 
 .menubutton-dual {
-  -moz-binding: url("chrome://communicator/skin/widgetBindings.xml#menubutton-dual-1");
-  margin: 3px 2px 0px 2px;
-  border: 0px;
+  -moz-binding: url("chrome://communicator/skin/widgetBindings.xml#menubutton-dual-2");
+  border: none;
   padding: 0px;
 }
 
@@ -170,7 +165,7 @@ menubutton.button-toolbar-4 {
 .menubutton-dual.button-toolbar-3 {
   -moz-binding: url("chrome://global/content/menulistBindings.xml#menubutton-dual-ex");  
   margin: 2px;
-  color: #1C1D1F;
+  color: #FFFFFF;
   font-family: message-box;
 }
 

themes/modern/communicator/prefpanels.css

@@ -14,11 +14,11 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
+ *
  */
 
 /* ==== prefpanels.css ==================================================

themes/modern/communicator/profile/newProfile1_2.css

@@ -14,11 +14,11 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
+ *
  */
 
 /* ===== newProile1_2.css =================================================
@@ -30,4 +30,3 @@
 #finishtext {
   margin-top: -20px;
 }
-

themes/modern/communicator/profile/profile.css

@@ -14,7 +14,7 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):

themes/modern/communicator/related/related.css

@@ -14,11 +14,11 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
+ *
  */
 
 /* ===== related.css ====================================================
@@ -95,6 +95,6 @@ treeitem[selected="true"] > treerow.relatedresult {
 }
 
 .tree-cell-twisty {
-  display: none;
+  visibility: collapsed;
 }
 

themes/modern/communicator/search/internetresults.css

@@ -14,11 +14,11 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
+ *
  */
 
 /* ===== internetresults.css ============================================
@@ -28,12 +28,16 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #multi-results-header {
+  border-bottom: 1px outset #587B98;
   padding: 5px 6px 5px 6px;
-  background-color: #000000;
-  color: #ffffff;
+  background-color: #587B98;
+  color: #ffffff;; 
   font-weight: bold;
 }
 
 #engineTabs {
-  padding-left: 3px;
+  border-bottom: 1px outset #D7D9E0;
+  padding: 2px 3px 2px 3px;
+  vertical-align: middle;
 }
+

themes/modern/communicator/search/search-editor.css

@@ -14,11 +14,11 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
+ *
  */
 
 /* ===== search-editor.css ==============================================

themes/modern/communicator/search/search.css

@@ -14,11 +14,11 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
+ *
  */
 
 /* ===== search.css =====================================================

themes/modern/communicator/securityOverlay.css

@@ -14,11 +14,11 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
+ *
  */
 
 /* ==== securityOverlay.css =============================================

themes/modern/communicator/sidebar/customize.css

@@ -1,4 +1,5 @@
-/*
+/* -*- Mode: C; c-basic-offset: 2 -*-
+ *
  * The contents of this file are subject to the Netscape Public
  * License Version 1.1 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
@@ -9,24 +10,16 @@
  * implied. See the License for the specific language governing
  * rights and limitations under the License.
  *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
+ * The Original Code is mozilla.org code.
  *
  * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s): 
- *   Joe Hewitt (hewitt@netscape.com)
  */
 
-/* ===== customize.css ==================================================
-  == Styles used by the Customize Sidebar dialog.
-  ======================================================================= */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
 #reorder {
   text-align: center;
 }
@@ -34,4 +27,3 @@
 #other-panels {
   min-width: 180px;
 }
-

themes/modern/communicator/sidebar/preview.css

@@ -14,11 +14,11 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
+ *
  */
 
 /* ===== preview.css ====================================================

themes/modern/communicator/sidebar/sidebar.css

@@ -14,7 +14,7 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):
@@ -31,23 +31,20 @@
 
 #sidebar-box {
   margin-top: 0px;
-  border-top: 1px solid #92ABC9;
-  border-right: 1px solid #000000;
+  border-top: 1px solid #C7D0D9;
+  background-color: #C7D0D9;
 }
 
-.sidebar-splitter {
-  border-left: none;
+#sidebar-title-box {
+  border-bottom: none;
 }
 
 /* ::::: sidebar header ::::: */
 
 .sidebarheader-main {
-  padding: 0px 0px 2px 18px;
-  background-color: #5C7794;
-  color: #FFFFFF;
-}
-
-.sidebarheader-main > .sidebar-header-text {
+  padding: 2px 0px 2px 16px;
+  background-color: #C7D0D9;
+  color: #000000;
   font-weight: bold;
 }
 
@@ -58,14 +55,16 @@
 /* ..... picker button ..... */
 
 #sidebar-panel-picker {
-  margin: 1px;
-  border: 1px solid #5C7794;
+  margin-right: 1px;
+  margin-top: 1px;
+  border: 1px solid transparent;
   padding: 2px;
-  color: #FFFFFF;
+  color: #3B414F;
+  -moz-border-radius: 0px;
 }
 
 #sidebar-panel-picker:hover {
-  border: 1px outset #5C7794;
+  border: 1px outset #94ACC1;
 }
 
 #sidebar-panel-picker[menuactive="true"],
@@ -78,8 +77,8 @@
 }
 
 #sidebar-panel-picker > .menubutton-internal-box > .menubutton-single-icon {
-  padding-left: 2px;
   list-style-image: url("chrome://communicator/skin/sidebar/sbpicker-arrow.gif");
+  padding-left: 2px;
 }
 
 #sidebar-panel-picker > .menu-text {
@@ -108,7 +107,7 @@ box[loadstate="stopped"] > box > box > .image-panel-loading {
 /* ::::: sidebar panel ::::: */
 
 .iframe-panel {
-  border-bottom: 1px solid #C1C8D5;
+  border-bottom: 1px solid #94ACC1;
 }
 
 /* ::::: sidebar tabs ::::: */
@@ -117,87 +116,120 @@ box[loadstate="stopped"] > box > box > .image-panel-loading {
  
 .box-texttab {
   -moz-binding: url("chrome://communicator/skin/sidebar/sidebarBindings.xml#sidebar-tab");
-  border-bottom: 3px solid #5C7794;
-  background-color: #5C7794;
+  border-bottom: 3px solid #94ACC1;
+  min-height: 22px;
+  background-color: #94ACC1;
+  color: #3B414F;
 }
    
-.box-texttab-left {
-  width: 15px;
-  min-height: 18px;
-  background: url("chrome://communicator/skin/sidebar/sbtab-dod-lft.gif") no-repeat top;
+.sidebar-tab-leftcap {
+  background: url("chrome://communicator/skin/sidebar/sbtab-dod-lftcap.gif") no-repeat top;
+  width: 11px;
 }
 
-.box-texttab-text-container {
-  padding-top: 4px;
-  background-color: #5C7794;
-  background: url("chrome://communicator/skin/sidebar/sbtab-dark.gif") repeat-x;
-  color: #FFFFFF;
-  vertical-align: top !important;
+.sidebar-tab-text {
+  margin-top: 6px;
 }
   
-.box-texttab-right {
-  width: 30px;
-  min-height: 18px;
-  background: url("chrome://communicator/skin/sidebar/sbtab-dod-rit.gif") no-repeat top;
+.sidebar-tab-mid {
+  min-width: 100px;
+  background: url("chrome://communicator/skin/sidebar/sbtab-dod-mid.gif") repeat-x top;
 }
 
-/* ..... top tab ..... */
+.sidebar-tab-rightcap {
+  background: url("chrome://communicator/skin/sidebar/sbtab-dod-ritcap.gif") no-repeat top;
+  width: 18px;
+}
 
-.box-texttab[top-panel="true"] {
-  background-color: #5C7794;
+.sidebar-tab-right {
+  background: url("chrome://communicator/skin/sidebar/sbtab-dod-rit.gif") repeat-x top;
+}
+
+/* ..... active state ..... */
+
+.box-texttab:hover:active > .sidebar-tab-leftcap {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-dod-lftcap-act.gif");
+}
+
+ .box-texttab:hover:active > .sidebar-tab-mid {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-dod-mid-act.gif");
+}
+
+ .box-texttab:hover:active > .sidebar-tab-rightcap {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-dod-ritcap-act.gif");
 }
 
 /* ..... bottom tab ..... */
 
 .box-texttab[last-panel="true"] {
-  border-bottom: 7px solid #5C7794;
+  border-bottom: 1px solid #1D1F26;
+  padding-bottom: 7px;
+  background-color: #94ACC1;
 } 
 
 .box-texttab[last-panel="true"][selected="true"] {
-  border-bottom: none;
+  border-bottom-width: 3px;
 } 
 
 /* ..... selected tab ..... */
 
 .box-texttab[selected="true"] {
-  border-bottom: none;
-  min-height: 24px;
+  border-bottom: 2px solid black;
+  min-height: 23px;
+  background-color: #587B98;
+  color: #ffffff;
 }
     
-.box-texttab[selected="true"] > .box-texttab-left {
-  background: url("chrome://communicator/skin/sidebar/sbtab-lod-lft.gif") #C1C8D5 no-repeat top;
+.sidebar-tab-leftcap[selected="true"],
+.box-texttab:hover:active > .sidebar-tab-leftcap[selected="true"] {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-lod-lftcap.gif");
 }
 
-.box-texttab[selected="true"] > .box-texttab-text-container {
-  background: url("chrome://communicator/skin/sidebar/sbtab-light.gif") #C1C8D5 repeat-x;
-  color: #000000;
+.sidebar-tab-mid[selected="true"],
+.box-texttab:hover:active > .sidebar-tab-mid[selected="true"] {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-lod-mid.gif");
 }
 
-.box-texttab[selected="true"] > .box-texttab-right {
-  background: url("chrome://communicator/skin/sidebar/sbtab-lod-rit.gif") #C1C8D5 no-repeat top;
+.sidebar-tab-rightcap[selected="true"],
+.box-texttab:hover:active > .sidebar-tab-rightcap[selected="true"] {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-lod-ritcap.gif");
+}
+
+.sidebar-tab-right[selected="true"] {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-lod-rit.gif");
 }    
 
 /* ..... first tab after selected ..... */
 
 .box-texttab[first-panel-after-selected="true"] {
-  border-top: 1px solid #E7EBF7;
-  background-color: #C1C8D5;
+  min-height: 23px;
 }
 
-.box-texttab[first-panel-after-selected="true"]  > .box-texttab-left {
-  margin-top: 3px;
-  background: url("chrome://communicator/skin/sidebar/sbtab-dol-lft.gif") #5C7794 no-repeat top;
+.sidebar-tab-leftcap[first-panel-after-selected="true"] {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-dol-lftcap.gif");
 }
 
-.box-texttab[first-panel-after-selected="true"]
-    > .box-texttab-text-container
-{
-  border-top: 3px solid #C1C8D5;
-  background-color: #5C7794;
+.sidebar-tab-mid[first-panel-after-selected="true"] {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-dol-mid.gif");
 }
     
-.box-texttab[first-panel-after-selected="true"]  > .box-texttab-right {
-  margin-top: 3px;
-  background: url("chrome://communicator/skin/sidebar/sbtab-dol-rit.gif") #5C7794 no-repeat top;
+.sidebar-tab-rightcap[first-panel-after-selected="true"] {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-dol-ritcap.gif");
+}
+
+.sidebar-tab-right[first-panel-after-selected="true"] {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-dol-rit.gif");
+}
+    
+.box-texttab:hover:active > .sidebar-tab-leftcap[first-panel-after-selected="true"] {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-dol-lftcap-act.gif");
+}
+
+.box-texttab:hover:active > .sidebar-tab-mid[first-panel-after-selected="true"] {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-dol-mid-act.gif");
+}
+    
+.box-texttab:hover:active > .sidebar-tab-rightcap[first-panel-after-selected="true"] {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-dol-ritcap-act.gif");
 }
 

themes/modern/communicator/sidebar/sidebarBindings.xml

@@ -6,11 +6,12 @@
 
   <binding id="sidebar-tab" extends="xul:button">
     <content>
-      <xul:image class="box-texttab-left"/>
-      <xul:box class="box-texttab-text-container" autostretch="never" flex="1">
-        <xul:text class="box-texttab-text" inherits="value=label" crop="right"/>
+      <xul:image class="sidebar-tab-leftcap" inherits="selected,first-panel-after-selected,top-panel,last-panel"/>
+      <xul:box class="sidebar-tab-mid" inherits="selected,first-panel-after-selected,top-panel,last-panel">
+        <xul:text class="sidebar-tab-text" inherits="value=label" crop="right"/>
       </xul:box>
-      <xul:image class="box-texttab-right"/>
+      <xul:image class="sidebar-tab-rightcap" inherits="selected,first-panel-after-selected,top-panel,last-panel"/>
+      <xul:spring class="sidebar-tab-right" inherits="selected,first-panel-after-selected,top-panel,last-panel" flex="1"/>
     </content>
   </binding>
 

themes/modern/communicator/taskbar/taskbarBindings.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-
-<bindings id="taskbarBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-   
-  <binding id="taskbar" extends="xul:box">
-    <content>
-        <xul:box class="taskbar-image-middle" flex="1">
-            <children/>
-        </xul:box>
-        <xul:box orient="vertical">
-          <xul:spring class="taskbar-image-right"/>
-          <xul:spring class="taskbar-image-right-bg" flex="1"/>
-        </xul:box>
-    </content>
-  </binding>
-
-  <binding id="taskbar-menu-box" extends="xul:box">
-    <content>
-        <xul:box orient="vertical">
-          <xul:spring class="taskbar-mb-image-left"/>
-          <xul:spring class="taskbar-mb-image-left-bg" flex="1"/>
-        </xul:box>
-        <xul:box flex="1" class="taskbar-mb-middle-border-outer">
-          <xul:box flex="1" class="taskbar-mb-middle-border-middle">
-            <xul:box flex="1" class="taskbar-mb-middle-border-inner">  
-                <children/>
-            </xul:box>
-          </xul:box>
-        </xul:box>
-        <xul:box orient="vertical">
-          <xul:spring class="taskbar-mb-image-right"/>
-          <xul:spring class="taskbar-mb-image-right-bg" flex="1"/>
-        </xul:box>
-    </content>
-  </binding>
-
-</bindings>
-

themes/modern/communicator/tasksOverlay.css

@@ -14,11 +14,11 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
+ *
  */
 
 /* ==== tasksOverlay.css ================================================
@@ -73,83 +73,25 @@
 /* ::::: taskbar ::::: */
 
 #taskbar {
-  -moz-binding: url("chrome://communicator/skin/taskbar/taskbarBindings.xml#taskbar");
   -moz-user-focus: ignore;
-  min-height: 1em;
-  background-color: #435772;
-}
-
-.taskbar-image-middle {
-  height: 17px;
-  background: url("chrome://communicator/skin/taskbar/tbar-mid.gif") repeat-x;
-}
-
-.taskbar-image-right {
-  width: 12px;
-  height: 17px;
-  background: url("chrome://communicator/skin/taskbar/tbar-rit-top.gif") no-repeat;
-}
-
-.taskbar-image-right-bg {
-  background: url("chrome://communicator/skin/taskbar/tbar-rit-btm.gif") repeat-y;
-}
-
-/* ::::: taskbar menu box ::::: */
-
-#taskbarMenuBox {
-  -moz-binding: url("chrome://communicator/skin/taskbar/taskbarBindings.xml#taskbar-menu-box");
-  -moz-user-focus: ignore;
-}
-
-.taskbar-mb-image-left {
-  width: 6px;
-  height: 17px;
-  background: url("chrome://communicator/skin/taskbar/groove-lft.gif") no-repeat;
-}
-
-.taskbar-mb-image-right-bg {
-  background: url("chrome://communicator/skin/taskbar/groove-rit-bg.gif") repeat-y;
-}
-
-.taskbar-mb-image-left-bg {
-  background: url("chrome://communicator/skin/taskbar/groove-lft-bg.gif") repeat-y;
-}
-
-.taskbar-mb-middle-border-outer {
-  border-top: 1px solid #5A728E;
-}
-
-.taskbar-mb-middle-border-middle {
-  border-top: 1px solid #2B3746;
-}
-
-.taskbar-mb-middle-border-inner {
-  border-top: 1px solid #A9BED8;
-}
-
-.taskbar-mb-image-right {
-  width: 7px;
-  height: 17px;
-  background: url("chrome://communicator/skin/taskbar/groove-rit.gif") no-repeat;
-}
-
-/* hide goto menu bug #47633 */
-#taskbarGotoMenuBox{
-  display: none;
-}
-
-/* ::::: taskbar buttons and spacers ::::: */
-
-.taskbutton {
-  margin: 0px;
-  padding: 0px;
-}
-
-.taskbutton > .button-internal-box {
-  vertical-align: bottom;
+  min-height: 18px;
+  background-color: #C7D0D9;
+  color: #22262F;
 }
 
 .taskbarspacer {
   max-width: 0px;
 }
 
+/* hide goto menu bug #47633 */ 
+
+#taskbarGotoMenuBox {
+  display: none;  
+}  
+
+/* ::::: taskbar buttons and spacers ::::: */
+
+.taskbutton {
+  margin: 0px 0px 0px 3px;
+  padding: 0px;
+}

themes/modern/communicator/toolbar.css

@@ -14,11 +14,11 @@
  *
  * The Initial Developer of the Original Code is Netscape
  * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
  * Rights Reserved.
  *
  * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
+ *
  */
 
 /* ==== toolbar.css =====================================================
@@ -31,103 +31,78 @@
 
 .toolbar-primary {
   -moz-binding: url("chrome://communicator/skin/toolbar/toolbarBindings.xml#toolbar-primary");
-  background-color: transparent;
-  background-image: none;
+  min-height: 51px;
+  background-color: #B1BDC9;
 }
 
 .toolbar-primary > .toolbar-holder {
-  border-top: 1px solid #DCEEFF;
-  border-left: none;
+  border: none;
 }
 
-.toolbar-primary-image-left,
-.toolbar-primary-image-mid,
-.toolbar-primary-image-right {
-  border-top: 1px solid #DCEEFF;
+.toolbar-primary-mid-top {
+  height: 36px;
+  background: url("chrome://communicator/skin/toolbar/prtb-mid-top.gif") repeat-x top;
 }
   
-.toolbar-primary-image-left {
-  width: 10px;
-}
-
-.toolbar-primary-image-left-top {
-  height: 27px;
-  background: url("chrome://communicator/skin/toolbar/prtb-lft-top.gif") no-repeat;
-}
-
-.toolbar-primary-image-left-mid {
-  background: url("chrome://communicator/skin/toolbar/prtb-lft-mid.gif") repeat-y;
-}
-
-.toolbar-primary-image-left-btm {
+.toolbar-primary-mid-btm {
   height: 5px;
-  background: url("chrome://communicator/skin/toolbar/prtb-lft-btm.gif") no-repeat;
+  background: url("chrome://communicator/skin/toolbar/prtb-mid-btm.gif") repeat-x bottom;
 }
 
-.toolbar-primary-image-mid-mid {
-  background: url("chrome://communicator/skin/toolbar/prtb-mid-mid.gif") repeat-x;
-  background-color: #5E789B;
-  vertical-align: top !important;
+.toolbar-primary-right {
+  width: 52px;
 }
 
-.toolbar-primary-image-mid-btm {
-  height: 3px;
-  background: url("chrome://communicator/skin/toolbar/prtb-mid-btm.gif") repeat-x;
-}
-
-.toolbar-primary-image-right {
-  width: 21px;
-}
-
-.toolbar-primary-image-right-top {
-  height: 27px;
+.toolbar-primary-right-top {
+  height: 36px;
   background: url("chrome://communicator/skin/toolbar/prtb-rit-top.gif") no-repeat;
 }
   
-.toolbar-primary-image-right-mid {
+.toolbar-primary-right-mid {
   background: url("chrome://communicator/skin/toolbar/prtb-rit-mid.gif") repeat-y;
 }
   
-.toolbar-primary-image-right-btm {
-  height: 8px;
+.toolbar-primary-right-btm {
+  height: 5px;
   background: url("chrome://communicator/skin/toolbar/prtb-rit-btm.gif") no-repeat;
 }
 
-/* ..... the grippy inside of the .toolbar-primary ..... */
+/* ::::: toolbargrippy ::::: */
  
 .toolbar-primary-grippy { 
-  background: url("chrome://communicator/skin/toolbar/grip-prtb-mid.gif") repeat-y;
+  width: 13px;
+  background: url("chrome://communicator/skin/toolbar/prtb-grip-mid.gif") repeat-y;
 } 
 
 .toolbar-primary-grippy > .toolbargrippy-top {
-  height: 5px;
-  background: url("chrome://communicator/skin/toolbar/grip-prtb-top.gif") top no-repeat;
+  height: 40px;
+  background: url("chrome://communicator/skin/toolbar/prtb-grip-top.gif") no-repeat top;
 }
 
 .toolbar-primary-grippy > .toolbargrippy-btm {
-  height: 38px;
-  background: url("chrome://communicator/skin/toolbar/grip-prtb-btm.gif") bottom no-repeat;
+  height: 10px;
+  background: url("chrome://communicator/skin/toolbar/prtb-grip-btm.gif") no-repeat bottom;
 }
   
 .toolbar-primary-grippy:hover:active {
-  background-image: url("chrome://communicator/skin/toolbar/grip-prtb-mid-act.gif");
+  background-image: url("chrome://communicator/skin/toolbar/prtb-grip-mid-act.gif");
 }
 
 .toolbar-primary-grippy:hover:active > .toolbargrippy-top {
-  background-image: url("chrome://communicator/skin/toolbar/grip-prtb-top-act.gif");
+  background-image: url("chrome://communicator/skin/toolbar/prtb-grip-top-act.gif");
 }
 
 .toolbar-primary-grippy:hover:active > .toolbargrippy-btm {
-  background-image: url("chrome://communicator/skin/toolbar/grip-prtb-btm-act.gif");
+  background-image: url("chrome://communicator/skin/toolbar/prtb-grip-btm-act.gif");
 }
 
 /* ::::: toolbar-primary separator ::::: */
 
 .toolbarseparator-primary {
-  margin: 9px 0px 0px 0px;
+  margin: 0px;
+  padding: 0px;
   border: none;
-  width: 4px;
-  height: 29px;
-  background: url("chrome://communicator/skin/toolbar/separator-prtb.gif") no-repeat;
+  width: 18px;
+  background: none;
 }