#46423 -> new modern skin. Fixes to icons and colors in formatting toolbar in messenger compose and editor. r=hewitt.

themes/modern/communicator/MANIFEST

@@ -27,3 +27,7 @@ tb-menubutton-dm-hover.gif
 tb-menubutton-dm.gif
 toolbar.css
 unlock.gif
+throbber-groove-bottom.gif
+throbber-groove-left.gif
+throbber-groove-right.gif
+throbber-groove-top.gif

themes/modern/communicator/Makefile.in

@@ -57,6 +57,10 @@ EXPORT_RESOURCE = \
 		$(srcdir)/tb-menubutton-dm.gif \
 		$(srcdir)/toolbar.css \
 		$(srcdir)/unlock.gif \
+		$(srcdir)/throbber-groove-bottom.gif \
+		$(srcdir)/throbber-groove-left.gif \
+		$(srcdir)/throbber-groove-right.gif \
+		$(srcdir)/throbber-groove-top.gif \
 		$(NULL)
 
 DIRS = search xpinstall sidebar bookmarks directory profile regviewer related 

themes/modern/communicator/brand.css

@@ -1,13 +1,14 @@
 
 #navigator-throbber
   {
-    -moz-binding          : url("chrome://global/content/xulBindings.xml#buttontop");
+    -moz-binding          : url("chrome://global/skin/globalBindings.xml#throbber");
     list-style-image      : url("chrome://global/skin/animthrob_single.gif");
-    margin                : 5px 1px 9px 8px;
+    margin                : 2px 1px 6px 8px;
     padding               : 0px;
     cursor                : pointer;
     border                : 0px;
     background-color	  : transparent;
+    text-align			  : center;
     -moz-user-focus       : ignore;
   }  
 
@@ -18,18 +19,38 @@
   
 #navigator-throbber:hover:active
   {
-    margin               : 4px 0px 5px 9px;
+    margin               : 2px 1px 6px 8px;
   }
 
-#navigator-throbber > .button-internal-box
+.throbber-icon
   {
-    border                : 0px;
-    padding               : 0px;
-    margin                : 0px;
+  	margin		: 0px 0px;
   }
-  
-#navigator-throbber > .button-internal-box > .button-text-container
+
+.throbber-groove-left
   {
-    display               : none;
-  }
-  
+  	background			 : url(chrome://communicator/skin/throbber-groove-left.gif) no-repeat;
+  	width				 : 3px;
+  	height				 : 38px;
+  }  
+
+.throbber-groove-right
+  {
+  	background			 : url(chrome://communicator/skin/throbber-groove-right.gif) no-repeat;
+  	width				 : 3px;
+  	height				 : 38px;
+  }  
+
+.throbber-groove-top
+  {
+  	background			 : url(chrome://communicator/skin/throbber-groove-top.gif) no-repeat;
+  	height				 : 3px;
+  	width				 : 32px;
+  }  
+
+.throbber-groove-bottom
+  {
+  	background			 : url(chrome://communicator/skin/throbber-groove-bottom.gif) no-repeat;
+  	height				 : 3px;
+  	width				 : 32px;
+  }  

themes/modern/communicator/button.css

@@ -56,7 +56,7 @@
   .button-toolbar[toggled="true"]
     {
       border                : 0px solid #036;
-      background-color      : #AAA;
+      background-color      : #DFFFFF;
       -moz-border-radius    : 4px;
     }    
 
@@ -75,7 +75,7 @@
   .button-toolbar-1
     {
       color               : #D0E7E7;
-      margin              : 3px 2px 6px 2px;
+      margin              : 3px 2px 9px 2px;
       font-size           : smaller;
       border              : 0px;
       padding			  : 0px;
@@ -98,7 +98,7 @@
   .button-toolbar-1[disabled="true"]:hover,
   .button-toolbar-1[disabled="true"]:hover:active
     {
-      margin              : 3px 2px 6px 2px;
+      margin              : 3px 2px 9px 2px;
       border              : none;
     }
     

themes/modern/communicator/makefile.win

@@ -56,6 +56,10 @@ install::
 	$(MAKE_INSTALL) tb-menubutton-dm.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
 	$(MAKE_INSTALL) toolbar.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
 	$(MAKE_INSTALL) unlock.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
+	$(MAKE_INSTALL) throbber-groove-bottom.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
+	$(MAKE_INSTALL) throbber-groove-left.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
+	$(MAKE_INSTALL) throbber-groove-right.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
+	$(MAKE_INSTALL) throbber-groove-top.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
 
 clobber::
 	rm -f $(DIST)\chrome\$(THEME)\communicator\skin\*.*

themes/modern/communicator/menubutton.css

@@ -68,7 +68,7 @@
   {
     -moz-binding            : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-dual-foo");
     border                  : 0px solid red;
-    margin      	        : 3px 2px 6px 2px;
+    margin      	        : 3px 2px 9px 2px;
     padding					: 0px;
   }
 
@@ -76,7 +76,7 @@
 .menubutton-dual.toolbar[disabled="true"]:hover,
 .menubutton-dual.toolbar[disabled="true"]:hover:active
   {
-    margin      	        : 3px 2px 6px 2px;
+    margin      	        : 3px 2px 9px 2px;
 	padding					: 0px;
   }
 

themes/modern/communicator/toolbar.css

@@ -42,7 +42,7 @@ toolbargrippy[tbgrippy-collapsed="true"]:hover:active
 
 toolbar[collapsed="true"] > toolbargrippy 
   {
-    width                 : 30px;
+    width                 : 20px;
   }
   
 .toolbar-standard > toolbargrippy

themes/modern/editor/EditorToolbars.css

@@ -27,7 +27,15 @@
 }
 
 #FormatToolbar {
-  border-bottom: 1px solid #003366;
+  border-top: 1px solid #B6CADF;
+  border-bottom: 1px solid #000000;
+  border-left: 1px solid #48607E;
+  border-right: 2px solid #4D6685;
+  background-color: #7B94B2;  
+}
+
+#FormatToolbar > toolbargrippy {
+  margin-left: 0px;
 }
 
 .separator_small { 
@@ -383,19 +391,19 @@ button.edit-mode > .button-internal-box > .button.icon:hover:active
   }
 
 #linkButton-dark {
-	list-style-image:url("chrome://editor/skin/images/link.gif");
+	//list-style-image:url("chrome://editor/skin/images/link.gif");
 }
 #imageButton-dark {
-	list-style-image:url("chrome://editor/skin/images/image.gif");
+	//list-style-image:url("chrome://editor/skin/images/image.gif");
 }
 #namedAnchorButton-dark {
-	list-style-image:url("chrome://editor/skin/images/anchor.gif");
+	//list-style-image:url("chrome://editor/skin/images/anchor.gif");
 }
 #hlineButton-dark {
-	list-style-image:url("chrome://editor/skin/images/hline.gif");
+	//list-style-image:url("chrome://editor/skin/images/hline.gif");
 }
 #tableButton-dark {
-	list-style-image:url("chrome://editor/skin/images/table.gif");
+	//list-style-image:url("chrome://editor/skin/images/table.gif");
 }
 
 #spellingButton {

themes/modern/global/global.css

@@ -63,7 +63,7 @@
   
   window.dialog 
     { 
-      background-color    : #CCCCCC;
+      background-color    : #B4C3D4;
       padding             : 7px 5px 5px 5px;
     }
 
@@ -127,11 +127,13 @@
   #status-bar 
     {
       border-top          : 1px solid #11151F;
-      background-color    : #6D88AA;
+      background-color    : #6E89AB;
       -moz-user-focus     : ignore;
       overflow            : hidden;
       margin			  : 0px;
       padding			  : 0px;
+      color				  : #D0E7E7;
+      font-size			  : 10px;
     }
 
 /**

themes/modern/global/globalBindings.xml

@@ -107,4 +107,16 @@
     </content>
   </binding>
 
+  <binding id="throbber" extends="chrome://global/content/xulBindings.xml#basetext">
+  	<content excludes="observes,template">
+  	  <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"/>
+  	  	<xul:spring class="throbber-groove-bottom"/>
+  	  </xul:box>
+  	  <xul:spring class="throbber-groove-right"/>
+    </content>
+  </binding>
+
 </bindings>

themes/modern/global/menu.css

@@ -54,9 +54,9 @@ menupopup > menuitem, popup > menuitem
 
 menuseparator 
   {
-  	border-top			  : 1px solid #172254;
-    border-bottom         : 1px solid #5A518A; 
-    margin                : 2px 0px;
+  	border-top			  : 1px solid #FEFEFE;
+    border-bottom         : 1px solid #012655; 
+    margin                : 2px 3px;
   }
 
 menubar > menu 
@@ -203,6 +203,7 @@ menuitem[checked="true"][type="radio"][menuactive="true"]
     color                 : #000000;
     font-size             : 10px;
     padding               : 2px;
+    padding-right		  : 3px;
   }
 
 /*

themes/modern/global/menulist.css

@@ -151,13 +151,13 @@
       border-bottom       : 1px inset #CCCCCC;
       border-top          : 0px;
     }
-    
+/*    
   menulist > menupopup > menuseparator 
     {
       border-top: 1px solid #172254;
       border-bottom: 1px solid #5A518A;
     }
-
+*/
 
   menulist > menupopup > menuitem 
     {

themes/modern/jar.mn

@@ -29,6 +29,10 @@ skins/modern.jar:
     communicator/skin/tb-menubutton-dm.gif                     (communicator/tb-menubutton-dm.gif)
     communicator/skin/toolbar.css                              (communicator/toolbar.css)
     communicator/skin/unlock.gif                               (communicator/unlock.gif)
+    communicator/skin/throbber-groove-bottom.gif               (communicator/throbber-groove-bottom.gif)
+    communicator/skin/throbber-groove-left.gif                 (communicator/throbber-groove-left.gif)
+    communicator/skin/throbber-groove-right.gif                (communicator/throbber-groove-right.gif)
+    communicator/skin/throbber-groove-top.gif                  (communicator/throbber-groove-top.gif)
     editor/skin/EdImageMap.css                                 (editor/EdImageMap.css)
     editor/skin/EdImageMapPage.css                             (editor/EdImageMapPage.css)
     editor/skin/EditorDialog.css                               (editor/EditorDialog.css)

themes/modern/messenger/messengercompose/messengercompose.css

@@ -20,6 +20,26 @@ box.padded {
 	width: 100%;
 }
 
+/* Header toolbar */
+
+#MsgHeadersToolbar {
+	background-color	: #7B94B2;
+	border-top			: 2px solid #4C6484;
+	border-bottom		: 0px;
+	border-left			: 1px solid #48607E;
+	border-right		: 2px solid #4D6685;
+}
+
+#MsgHeadersToolbar > toolbargrippy {
+	border-top			: 1px solid #B6CADF;
+	margin-left			: 0px;
+}
+
+#msgheaderstoolbar-box {
+	border-top			: 1px solid #B6CADF;
+}
+
+
 
 /* addressing widget */
 
@@ -229,10 +249,6 @@ textfield.addressingWidget[autocomplete="true"] > box
     list-style-image      : url("chrome://global/skin/stop-clicked.gif");
   }
 
-toolbar#MsgHeadersToolbar {
-  border-bottom: 1px solid #999999;
-}
-
 box#addressingWidget {
   -moz-user-focus: normal;
 }

themes/modern/navigator/navigator.css

@@ -331,8 +331,6 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
 #statusbar-display
   {
     list-style-image      : url("chrome://communicator/skin/document.gif");
-    font-size			  : 10px;
-    color				  : #D0E7E7;
   }
   
 #statusbar-display[error="true"]
@@ -360,3 +358,7 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
     -moz-user-focus       : ignore !important;
   }
 
+#PersonalToolbar
+  {
+  	background-color	  : #394B6E;
+  }