78221 - modern3 update: new toolbar icons galore, r=andreww, sr=ben

themes/modern/communicator/brand.css

@@ -31,17 +31,17 @@
   -moz-binding: url("chrome://communicator/skin/brand/brandBindings.xml#throbber");
   -moz-user-focus: ignore !important;
   cursor: pointer;
-  margin: 5px 12px 0px 0px;
+  margin: 6px 10px 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/throbber25-single.gif");
+  list-style-image: url("chrome://communicator/skin/brand/throbber-single.gif");
 }
 
 #navigator-throbber[busy="true"] {
-  list-style-image: url("chrome://communicator/skin/brand/throbber25-anim.gif");
+  list-style-image: url("chrome://communicator/skin/brand/throbber-anim.gif");
 }
 
 #throbber-box,

themes/modern/communicator/menubutton.css

@@ -106,7 +106,7 @@ menubutton.button-toolbar-2.bottom {
 /* ..... dropmarker box ..... */
 
 .menubutton-dual-dropmarker-box {
-  margin: 26px 0px 0px 23px;
+  margin: 26px 0px 0px 28px;
 }
 
 .button-toolbar-2 + .menubutton-dual-dropmarker-box {

themes/modern/communicator/toolbar.css

@@ -31,7 +31,7 @@
 
 .toolbar-primary {
   -moz-binding: url("chrome://communicator/skin/toolbar/toolbarBindings.xml#toolbar-primary");
-  min-height: 51px;
+  min-height: 43px;
   background-color: #B1BDC9;
 }
 
@@ -39,6 +39,13 @@
   border: none;
 }
 
+.toolbar-primary-icon {
+  width: 77px;
+  height: 51px;
+  background-repeat: no-repeat;
+  background-align: top;
+}
+
 .toolbar-primary-mid-top {
   height: 36px;
   background: url("chrome://communicator/skin/toolbar/prtb-mid-top.gif") repeat-x top;
@@ -75,12 +82,12 @@
 } 
 
 .toolbar-primary-grippy > .toolbargrippy-top {
-  height: 40px;
+  height: 32px;
   background: url("chrome://communicator/skin/toolbar/prtb-grip-top.gif") no-repeat top;
 }
 
 .toolbar-primary-grippy > .toolbargrippy-btm {
-  height: 10px;
+  height: 11px;
   background: url("chrome://communicator/skin/toolbar/prtb-grip-btm.gif") no-repeat bottom;
 }
   

themes/modern/editor/EditorToolbars.css

@@ -27,6 +27,12 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+/* ::::: primary toolbar masthead ::::: */
+
+#EditToolbar > .toolbar-holder > .toolbar-primary-icon {
+  background-image: url("chrome://editor/skin/icons/mast-editor.gif");
+}
+
 /* ::::: primary toolbar buttons ::::: */
 
 .button-toolbar-2 {

themes/modern/global/globalBindings.xml

@@ -165,7 +165,7 @@
  
   <!-- :::/ scrollbar \ ::::::::::::::::::::::::::::::::::::::::::::::::::: -->
 
-  <binding id="scrollbar">
+  <binding id="scrollbar" extends="chrome://global/content/scrollbarBindings.xml#scrollbar">
     <content>
       <xul:scrollbarbutton type="decrement" inherits="sborient=align">
         <xul:image inherits="src"/>

themes/modern/global/wizard.css

@@ -0,0 +1,51 @@
+/*
+ * 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
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * 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 Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Joe Hewitt (hewitt@netscape.com)
+ */
+
+/* ===== wizard.css =====================================================
+  == Styles used by the wizards which contains buttons for stepping 
+  == through a wizard.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.wizard-header {
+  border-top: 1px solid #94AACE;
+  border-bottom: 1px solid #000000;
+  padding: 10px 0px 10px 0px;
+  background-color: #5B7693;
+  color: #ffffff;
+}
+
+.wizard-header-label {
+  margin-left: 23px;
+  font-weight: bold;
+}
+
+.wizard-header-description {
+  margin-left: 44px;
+  margin-right: 5px;
+}
+
+.wizard-page-box {
+  margin: 10px 44px;
+}

themes/modern/jar.mn

@@ -257,6 +257,7 @@ modern.jar:
   skin/modern/editor/btn2/underline-dis.gif                        (editor/btn2/underline-dis.gif)
   skin/modern/editor/btn2/underline-hov.gif                        (editor/btn2/underline-hov.gif)
   skin/modern/editor/btn2/underline.gif                            (editor/btn2/underline.gif)
+  skin/modern/editor/icons/mast-editor.gif                         (editor/icons/mast-editor.gif)
   skin/modern/editor/icons/editmode-html.gif                       (editor/icons/editmode-html.gif)
   skin/modern/editor/icons/editmode-normal.gif                     (editor/icons/editmode-normal.gif)
   skin/modern/editor/icons/editmode-preview.gif                    (editor/icons/editmode-preview.gif)
@@ -533,6 +534,7 @@ modern.jar:
   skin/modern/messenger/addressbook/btn1/newlist-dis.gif           (messenger/addressbook/btn1/newlist-dis.gif)
   skin/modern/messenger/addressbook/btn1/newlist-hov.gif           (messenger/addressbook/btn1/newlist-hov.gif)
   skin/modern/messenger/addressbook/btn1/newlist.gif               (messenger/addressbook/btn1/newlist.gif)
+  skin/modern/messenger/addressbook/icons/mast-ab.gif              (messenger/addressbook/icons/mast-ab.gif)
   skin/modern/messenger/addressbook/icons/directory-open.gif       (messenger/addressbook/icons/directory-open.gif)
   skin/modern/messenger/addressbook/icons/directory.gif            (messenger/addressbook/icons/directory.gif)
   skin/modern/messenger/addressbook/icons/list.gif                 (messenger/addressbook/icons/list.gif)
@@ -619,7 +621,7 @@ modern.jar:
   skin/modern/messenger/icons/message-news-attach.gif              (messenger/icons/message-news-attach.gif)
   skin/modern/messenger/icons/message-news-new.gif                 (messenger/icons/message-news-new.gif)
   skin/modern/messenger/icons/message-news.gif                     (messenger/icons/message-news.gif)
-  skin/modern/messenger/icons/prtb-mail-icon.gif                   (messenger/icons/prtb-mail-icon.gif)
+  skin/modern/messenger/icons/mast-mail.gif                        (messenger/icons/mast-mail.gif)
   skin/modern/messenger/icons/readcol-read.gif                     (messenger/icons/readcol-read.gif)
   skin/modern/messenger/icons/readcol-unread.gif                   (messenger/icons/readcol-unread.gif)
   skin/modern/messenger/icons/server-local-new.gif                 (messenger/icons/server-local-new.gif)
@@ -649,6 +651,7 @@ modern.jar:
   skin/modern/messenger/messengercompose/btn1/send-dis.gif         (messenger/messengercompose/btn1/send-dis.gif)
   skin/modern/messenger/messengercompose/btn1/send-hov.gif         (messenger/messengercompose/btn1/send-hov.gif)
   skin/modern/messenger/messengercompose/btn1/send.gif             (messenger/messengercompose/btn1/send.gif)
+  skin/modern/messenger/messengercompose/icons/mast-msgcomp.gif    (messenger/messengercompose/icons/mast-msgcomp.gif)
   skin/modern/navigator/contents.rdf                               (navigator/contents.rdf)
   skin/modern/navigator/navigator.css                              (navigator/navigator.css)
   skin/modern/navigator/navigatorBindings.xml                      (navigator/navigatorBindings.xml)
@@ -673,6 +676,10 @@ modern.jar:
   skin/modern/navigator/btn1/stop-dis.gif                          (navigator/btn1/stop-dis.gif)
   skin/modern/navigator/btn1/stop-hov.gif                          (navigator/btn1/stop-hov.gif)
   skin/modern/navigator/btn1/stop.gif                              (navigator/btn1/stop.gif)
+  skin/modern/navigator/toolbar/mbtn1-arrow.gif                    (navigator/toolbar/mbtn1-arrow.gif)
+  skin/modern/navigator/toolbar/mbtn1-arrow-dis.gif                (navigator/toolbar/mbtn1-arrow-dis.gif)
+  skin/modern/navigator/toolbar/mbtn1-arrow-act.gif                (navigator/toolbar/mbtn1-arrow-act.gif)
+  skin/modern/navigator/toolbar/mbtn1-arrow-hov.gif                (navigator/toolbar/mbtn1-arrow-hov.gif)
   skin/modern/navigator/toolbar/navbar-mid-top.gif                 (navigator/toolbar/navbar-mid-top.gif)
   skin/modern/navigator/toolbar/nav-groove-lft-btm.gif             (navigator/toolbar/nav-groove-lft-btm.gif)
   skin/modern/navigator/toolbar/nav-groove-lft-mid.gif             (navigator/toolbar/nav-groove-lft-mid.gif)

themes/modern/messenger/addressbook/addressbook.css

@@ -29,6 +29,12 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+/* ::::: primary toolbar masthead ::::: */
+
+#abToolbar > .toolbar-holder > .toolbar-primary-icon {
+  background-image: url("chrome://messenger/skin/addressbook/icons/mast-ab.gif");
+}
+
 /* ::::: primary toolbar buttons ::::: */
 
 #button-newcard {

themes/modern/messenger/messenger.css

@@ -30,11 +30,10 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* ::::: primary toolbar icon ::::: */
+/* ::::: primary toolbar masthead ::::: */
 
 #msgToolbar > .toolbar-holder > .toolbar-primary-icon {
-  width: 77px;
-  background: url("chrome://messenger/skin/icons/prtb-mail-icon.gif") no-repeat top;
+  background-image: url("chrome://messenger/skin/icons/mast-mail.gif");
 }
  
 /* ::::: primary toolbar buttons ::::: */