#46423 -> new modern skin. new editor formatting toolbar images, toolbar grippy, progressmeter, and edit-mode toolbar tabs. also small tweaks to classic. r=hewitt

themes/classic/editor/EditorToolbars.css

@@ -39,6 +39,10 @@
     overflow              : hidden;
   }
 
+#EditModeToolbar > toolbargrippy {
+	display: none;
+}
+
 button.edit-mode:hover, 
 button.edit-mode:hover:active,
 button.edit-mode 

themes/classic/global/mac/global.css

@@ -121,6 +121,8 @@
       border-right        : 1px solid #FFFFFF;
       border-left         : 1px solid #9D9D9D;
       border-bottom       : 1px solid #FFFFFF;
+      min-width			  : 1px;      // DON'T DELETE.  Removes disappearance of scrollbars in content pane when window is made smaller.
+									  // Talk to evaughan@netscape.com for details.
     }
   
   statusbarpanel

themes/classic/global/mac/tabcontrol.css

@@ -11,7 +11,6 @@ tab {
   -moz-binding		: url(chrome://global/skin/classicBindings.xml#tab);
   color				: #000000; 
   padding			: 0px;
-  max-height		: 24px;
 }
 
 .tab-image-left {
@@ -115,10 +114,6 @@ tabbox {
   background		: url(chrome://global/skin/tab-sm-bot-unsel-mid.gif) repeat-x;
 }
 
-.tab-bottom > .tab-image-middle > .tab-left {
-  padding			: 4px 0px;
-}
-
 .tab-bottom > .tab-image-right {
   background		: url(chrome://global/skin/tab-sm-bot-unsel-right.gif) no-repeat;
   width				: 11px;
@@ -126,7 +121,7 @@ tabbox {
 }
 
 .tab-bottom > .tab-image-middle > .tab-text {
-  padding			: 4px 0px 5px 0px;
+  padding			: 4px 0px 1px 0px;
 }
 
 .tab-bottom:hover:active > .tab-image-left { 
@@ -159,7 +154,7 @@ tabbox {
 }
 
 .tabbox-bottom > .tab-border-top-left {
-  background		: url(chrome://global/skin/tab-border-top.gif) repeat-x top;
+  background		: url(chrome://global/skin/tab-border-bot.gif) repeat-x top;
   width				: 2px;
 }
 

themes/classic/global/mac/toolbar.css

@@ -12,6 +12,8 @@ toolbox
 toolbar
   {
     background-color      : #DDDDDD;
+    min-width			  : 1px;      // DON'T DELETE.  Removes disappearance of scrollbars in content pane when window is made smaller.
+									  // Talk to evaughan@netscape.com for details.
   }
   
 .toolbar-holder

themes/classic/global/unix/global.css

@@ -121,6 +121,8 @@
       background-color    : threedface;
       overflow            : hidden;
       min-width           : 1px;
+      min-width			  : 1px;      // DON'T DELETE.  Removes disappearance of scrollbars in content pane when window is made smaller.
+									  // Talk to evaughan@netscape.com for details.
     }
   
   statusbarpanel  

themes/classic/global/unix/toolbar.css

@@ -16,6 +16,8 @@ toolbox
 toolbar
   {
     background-color      : threedface;
+    min-width			  : 1px;      // DON'T DELETE.  Removes disappearance of scrollbars in content pane when window is made smaller.
+									  // Talk to evaughan@netscape.com for details.
   }
   
 .toolbar-holder

themes/classic/global/win/global.css

@@ -128,6 +128,9 @@
       border-right        : 1px solid threedhighlight;
       border-bottom       : 1px solid threedhighlight;
       min-height          : 16px;
+      min-width			  : 1px;      // DON'T DELETE.  Removes disappearance of scrollbars in content pane when window is made smaller.
+									  // Talk to evaughan@netscape.com for details.
+
     }
   
   statusbarpanel 

themes/classic/global/win/toolbar.css

@@ -9,6 +9,9 @@ toolbox
 toolbar
   {
     background-color      : threedface;
+    min-width			  : 1px;      // DON'T DELETE.  Removes disappearance of scrollbars in content pane when window is made smaller.
+									  // Talk to evaughan@netscape.com for details.
+
   }
   
 .toolbar-holder

themes/modern/communicator/button.css

@@ -58,10 +58,10 @@
     
   .button-toolbar[toggled="true"]
     {
-      border                : 0px solid #036;
+/*      border                : 0px solid #036;
       background-color      : #DFFFFF;
       -moz-border-radius    : 4px;
-    }    
+  */  }    
 
   .button-toolbar[disabled="true"],
   .button-toolbar[disabled="true"]:hover,

themes/modern/communicator/toolbar.css

@@ -6,14 +6,16 @@ toolbar
     background-color      : #394B6E;
     border-bottom         : 1px solid #000000;
     border-top			  : 1px solid #B6CADF;
+    min-width			  : 1px;      // DON'T DELETE.  Removes disappearance of scrollbars in content pane when window is made smaller.
+									  // Talk to evaughan@netscape.com for details.
   }
 
 toolbargrippy 
   { 
     background		      : url("chrome://global/skin/tb-grippy-up.gif") no-repeat bottom;
-    width                 : 9px;
-    height                : 7px;
-    margin				  : 0px 0px 0px 1px;
+    width                 : 11px;
+    margin				  : 0px 0px 0px 0px;
+    border-bottom		  : 1px solid #1E2526;
   } 
 
 toolbargrippy:hover:active
@@ -82,7 +84,7 @@ toolbar[collapsed="true"] > toolbargrippy
 .toolbar-primary-image-left
   {
 	background            : url("chrome://global/skin/navbar-bg-leftcap.gif") no-repeat;
-    width				  : 24px;
+    width				  : 10px;
     height				  : 46px;
   }
 
@@ -95,7 +97,7 @@ toolbar[collapsed="true"] > toolbargrippy
 .toolbar-primary-image-right
   {
 	background            : url("chrome://global/skin/navbar-bg-rightcap.gif") no-repeat;
-  	width				  : 24px;
+  	width				  : 21px;
   	height				  : 46px;
   }
 

themes/modern/editor/EditorToolbars.css

@@ -31,7 +31,6 @@
   border-bottom: 1px solid #000000;
   border-left: 1px solid #48607E;
   border-right: 2px solid #4D6685;
-  background-color: #7B94B2;  
 }
 
 #FormatToolbar > toolbargrippy {
@@ -68,13 +67,17 @@
 #EditModeToolbar {
   padding:       0px;
   /* Same as "standard" toolbar background */
-  border-top:    1px solid #003366;
-  border-bottom: 1px solid darkgray;
+  border-bottom: 1px solid #B4C3D4;
   margin-bottom: 0px;
   min-width:     1px;
   color:         white;
-  background-color: #999999;
+  background-color: #B4C3D4;
   overflow:      hidden;
+  padding-bottom: 2px;
+}
+
+#EditModeToolbar > toolbargrippy {
+	display: none;
 }
 
 button.edit-mode:hover, button.edit-mode:hover:active,
@@ -429,11 +432,25 @@ button.edit-mode > .button-internal-box > .button.icon:hover:active
 
 /* formatting buttons */
 
+/* This prevents all these formatting buttons from shifting when clicked */
+.button-toolbar:hover:active > .button-internal-box
+ {
+    padding               : 1px 3px 1px 3px;
+ }
+
 #DecreaseFontSizeButton {
 	list-style-image:url("chrome://editor/skin/images/dec-font-size.gif");
 }
 
-#DecreaseFontSizeButton[disabled="true"] {
+#DecreaseFontSizeButton:hover, #DecreaseFontSizeButton[toggled="true"]:hover:active {
+	list-style-image:url("chrome://editor/skin/images/dec-font-size_hover.gif");
+}
+
+#DecreaseFontSizeButton[toggled="true"], #DecreaseFontSizeButton:hover:active{
+	list-style-image:url("chrome://editor/skin/images/dec-font-size_active.gif");
+}
+
+#DecreaseFontSizeButton[disabled="true"], #DecreaseFontSizeButton[disabled="true"]:hover:active {
 	list-style-image:url("chrome://editor/skin/images/dec-font-size_disabled.gif");
 }
 
@@ -441,56 +458,127 @@ button.edit-mode > .button-internal-box > .button.icon:hover:active
 	list-style-image:url("chrome://editor/skin/images/inc-font-size.gif");
 }
 
-#IncreaseFontSizeButton[disabled="true"] {
+#IncreaseFontSizeButton:hover, #IncreaseFontSizeButton[toggled="true"]:hover:active {
+	list-style-image:url("chrome://editor/skin/images/inc-font-size_hover.gif");
+}
+
+#IncreaseFontSizeButton[toggled="true"], #IncreaseFontSizeButton:hover:active {
+	list-style-image:url("chrome://editor/skin/images/inc-font-size_active.gif");
+}
+
+#IncreaseFontSizeButton[disabled="true"], #IncreaseFontSizeButton[disabled="true"]:hover:active {
 	list-style-image:url("chrome://editor/skin/images/inc-font-size_disabled.gif");
 }
 
 #boldButton {
   list-style-image:url(chrome://editor/skin/images/bold.gif); 
 }
-#boldButton[disabled="true"] {
+
+#boldButton:hover, #boldButton[toggled="true"]:hover:active {
+  list-style-image:url(chrome://editor/skin/images/bold_hover.gif); 
+}
+
+#boldButton[toggled="true"], #boldButton:hover:active {
+  list-style-image:url(chrome://editor/skin/images/bold_active.gif); 
+}
+
+#boldButton[disabled="true"], #boldButton[disabled="true"]:hover:active {
   list-style-image:url(chrome://editor/skin/images/bold_disabled.gif); 
 }
 
 #italicButton {
   list-style-image:url(chrome://editor/skin/images/italic.gif); 
 }
-#italicButton[disabled="true"] {
+
+#italicButton:hover, #italicButton[toggled="true"]:hover:active {
+  list-style-image:url(chrome://editor/skin/images/italic_hover.gif); 
+}
+
+#italicButton[toggled="true"], #italicButton:hover:active {
+  list-style-image:url(chrome://editor/skin/images/italic_active.gif); 
+}
+
+#italicButton[disabled="true"], #italicButton[disabled="true"]:hover:active {
   list-style-image:url(chrome://editor/skin/images/italic_disabled.gif); 
 }
 
 #underlineButton {
   list-style-image:url(chrome://editor/skin/images/underline.gif); 
 }
-#underlineButton[disabled="true"] {
+
+#underlineButton:hover, #underlineButton[toggled="true"]:hover:active {
+  list-style-image:url(chrome://editor/skin/images/underline_hover.gif); 
+}
+
+#underlineButton[toggled="true"], #underlineButton:hover:active {
+  list-style-image:url(chrome://editor/skin/images/underline_active.gif); 
+}
+
+#underlineButton[disabled="true"], #underlineButton[disabled="true"]:hover:active {
   list-style-image:url(chrome://editor/skin/images/underline_disabled.gif); 
 }
 
 #ulButton {
 	list-style-image:url("chrome://editor/skin/images/bullets.gif");
 }
-#ulButton[disabled="true"] {
+
+#ulButton:hover, #ulButton[toggled="true"]:hover:active {
+	list-style-image:url("chrome://editor/skin/images/bullets_hover.gif");
+}
+
+#ulButton[toggled="true"], #ulButton:hover:active {
+	list-style-image:url("chrome://editor/skin/images/bullets_active.gif");
+}
+
+#ulButton[disabled="true"], #ulButton[disabled="true"]:hover:active {
 	list-style-image:url("chrome://editor/skin/images/bullets_disabled.gif");
 }
 
 #olButton {
 	list-style-image:url("chrome://editor/skin/images/numbers.gif");
 }
-#olButton[disabled="true"] {
+
+#olButton:hover, #olButton[toggled="true"]:hover:active {
+	list-style-image:url("chrome://editor/skin/images/numbers_hover.gif");
+}
+
+#olButton[toggled="true"], #olButton:hover:active {
+	list-style-image:url("chrome://editor/skin/images/numbers_active.gif");
+}
+
+#olButton[disabled="true"], #olButton[disabled="true"]:hover:active {
 	list-style-image:url("chrome://editor/skin/images/numbers_disabled.gif");
 }
 
 #outdentButton {
 	list-style-image:url("chrome://editor/skin/images/outdent.gif");
 }
-#outdentButton[disabled="true"] {
+
+#outdentButton:hover, #outdentButton[toggled="true"]:hover:active {
+	list-style-image:url("chrome://editor/skin/images/outdent_hover.gif");
+}
+
+#outdentButton[toggled="true"], #outdentButton:hover:active {
+	list-style-image:url("chrome://editor/skin/images/outdent_active.gif");
+}
+
+#outdentButton[disabled="true"], #outdentButton[disabled="true"]:hover:active {
 	list-style-image:url("chrome://editor/skin/images/outdent_disabled.gif");
 }
 
 #indentButton {
 	list-style-image:url("chrome://editor/skin/images/indent.gif");
 }
-#indentButton[disabled="true"] {
+
+#indentButton:hover, #indentButton[toggled="true"]:hover:active {
+	list-style-image:url("chrome://editor/skin/images/indent_hover.gif");
+}
+
+#indentButton[toggled="true"], #indentButton:hover:active {
+	list-style-image:url("chrome://editor/skin/images/indent_active.gif");
+}
+
+#indentButton[disabled="true"], #indentButton[disabled="true"]:hover:active {
 	list-style-image:url("chrome://editor/skin/images/indent_disabled.gif");
 }
 
@@ -502,14 +590,54 @@ button.edit-mode > .button-internal-box > .button.icon:hover:active
 	list-style-image:url("chrome://editor/skin/images/object-popup.gif");
 }
 
+/************ These styles don't work yet.  I'm not sure why (nbhatla, 9/14/00)**************/
+
+#AlignPopupButton:hover, #AlignPopupButton[toggled="true"]:hover:active {
+	list-style-image:url("chrome://editor/skin/images/align_hover.gif");
+}
+
+#AlignPopupButton[toggled="true"], #AlignPopupButton:hover:active {
+	list-style-image:url("chrome://editor/skin/images/align_active.gif");
+}
+
+#AlignPopupButton[disabled="true"], #AlignPopupButton[disabled="true"]:hover:active {
+	list-style-image:url("chrome://editor/skin/images/align_disabled.gif");
+}
+
+#InsertPopupButton:hover, #InsertPopupButton[toggled="true"]:hover:active {
+	list-style-image:url("chrome://editor/skin/images/object-popup_hover.gif");
+}
+
+#InsertPopupButton[toggled="true"], #InsertPopupButton:hover:active {
+	list-style-image:url("chrome://editor/skin/images/object-popup_active.gif");
+}
+
+#InsertPopupButton[disabled="true"], #InsertPopupButton[disabled="true"]:hover:active {
+	list-style-image:url("chrome://editor/skin/images/object-popup_disabled.gif");
+}
+
+///////////////////////////////////////////////////
+
 #text-align-left,
 #align-left-button
 {
 	list-style-image:url("chrome://editor/skin/images/left.gif");
 }
 
-#text-align-left[disabled="true"],
-#align-left-button[disabled="true"] {
+#text-align-left:hover,
+#align-left-button:hover
+{
+	list-style-image:url("chrome://editor/skin/images/left_hover.gif");
+}
+
+#text-align-left[toggled="true"], #text-align-left:hover:active,
+#align-left-button[toggled="true"], #align-left-button:hover:active
+{
+	list-style-image:url("chrome://editor/skin/images/left_active.gif");
+}
+
+#text-align-left[disabled="true"], #text-align-left[disabled="true"]:hover:active,
+#align-left-button[disabled="true"], #align-left-button[disabled="true"]:hover:active {
 	list-style-image:url("chrome://editor/skin/images/left_disabled.gif");
 }
 
@@ -518,8 +646,18 @@ button.edit-mode > .button-internal-box > .button.icon:hover:active
 	list-style-image:url("chrome://editor/skin/images/center.gif");
 }
 
-#text-align-center[disabled="true"],
-#align-center-button[disabled="true"] {
+#text-align-center:hover,
+#align-center-button:hover {
+	list-style-image:url("chrome://editor/skin/images/center_hover.gif");
+}
+
+#text-align-center[toggled="true"], #text-align-center:hover:active,
+#align-center-button[toggled="true"], #align-center-button:hover:active {
+	list-style-image:url("chrome://editor/skin/images/center_active.gif");
+}
+
+#text-align-center[disabled="true"], #text-align-center[disabled="true"]:hover:active,
+#align-center-button[disabled="true"], #align-center-button[disabled="true"]:hover:active {
 	list-style-image:url("chrome://editor/skin/images/center_disabled.gif");
 }
 
@@ -528,8 +666,18 @@ button.edit-mode > .button-internal-box > .button.icon:hover:active
 	list-style-image:url("chrome://editor/skin/images/right.gif");
 }
 
-#text-align-right[disabled="true"],
-#align-right-button[disabled="true"] {
+#text-align-right:hover,
+#align-right-button:hover {
+	list-style-image:url("chrome://editor/skin/images/right_hover.gif");
+}
+
+#text-align-right[toggled="true"], #text-align-right:hover:active,
+#align-right-button[toggled="true"], #align-right-button:hover:active {
+	list-style-image:url("chrome://editor/skin/images/right_active.gif");
+}
+
+#text-align-right[disabled="true"], #text-align-right[disabled="true"]:hover:active,
+#align-right-button[disabled="true"], #align-right-button[disabled="true"]:hover:active {
 	list-style-image:url("chrome://editor/skin/images/right_disabled.gif");
 }
 
@@ -537,8 +685,19 @@ button.edit-mode > .button-internal-box > .button.icon:hover:active
 #align-justify-button {
 	list-style-image:url("chrome://editor/skin/images/justify.gif");
 }
-#text-align-justify[disabled="true"],
-#align-justify-button[disabled="true"] {
+
+#text-align-justify:hover,
+#align-justify-button:hover {
+	list-style-image:url("chrome://editor/skin/images/justify_hover.gif");
+}
+
+#text-align-justify[toggled="true"], #text-align-justify:hover:active,
+#align-justify-button[toggled="true"], #align-justify-button:hover:active {
+	list-style-image:url("chrome://editor/skin/images/justify_active.gif");
+}
+
+#text-align-justify[disabled="true"], #text-align-justify[disabled="true"]:hover:active,
+#align-justify-button[disabled="true"], #align-justify-button[disabled="true"]:hover:active {
 	list-style-image:url("chrome://editor/skin/images/justify_disabled.gif");
 }
 

themes/modern/editor/images/MANIFEST

@@ -101,3 +101,35 @@ table-clicked.gif
 table-disabled.gif
 table-hover.gif
 savefile-clicked.gif
+align_active.gif
+align_disabled.gif
+align_hover.gif
+bold_active.gif
+bold_hover.gif
+bullets_active.gif
+bullets_hover.gif
+center_active.gif
+center_hover.gif
+dec-font-size_active.gif
+dec-font-size_hover.gif
+inc-font-size_active.gif
+inc-font-size_hover.gif
+indent_active.gif
+indent_hover.gif
+italic_active.gif
+italic_hover.gif
+justify_active.gif
+justify_hover.gif
+left_active.gif
+left_hover.gif
+numbers_active.gif
+numbers_hover.gif
+object-popup_active.gif
+object-popup_disabled.gif
+object-popup_hover.gif
+outdent_active.gif
+outdent_hover.gif
+right_active.gif
+right_hover.gif
+underline_active.gif
+underline_hover.gif

themes/modern/editor/images/Makefile.in

@@ -133,6 +133,38 @@ EXPORT_RESOURCE_SAMPLES = \
 	table-disabled.gif \
 	table-hover.gif \
 	savefile-clicked.gif \
+	align_active.gif \
+	align_disabled.gif \
+	align_hover.gif \
+	bold_active.gif \
+	bold_hover.gif \
+	bullets_active.gif \
+	bullets_hover.gif \
+	center_active.gif \
+	center_hover.gif \
+	dec-font-size_active.gif \
+	dec-font-size_hover.gif \
+	inc-font-size_active.gif \
+	inc-font-size_hover.gif \
+	indent_active.gif \
+	indent_hover.gif \
+	italic_active.gif \
+	italic_hover.gif \
+	justify_active.gif \
+	justify_hover.gif \
+	left_active.gif \
+	left_hover.gif \
+	numbers_active.gif \
+	numbers_hover.gif \
+	object-popup_active.gif \
+	object-popup_disabled.gif \
+	object-popup_hover.gif \
+	outdent_active.gif \
+	outdent_hover.gif \
+	right_active.gif \
+	right_hover.gif \
+	underline_active.gif \
+	underline_hover.gif \
     $(NULL)
 
 include $(topsrcdir)/config/rules.mk

themes/modern/editor/images/makefile.win

@@ -131,3 +131,35 @@ install::
 	$(MAKE_INSTALL) table-clicked.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
 	$(MAKE_INSTALL) table-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
 	$(MAKE_INSTALL) table-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) align_active.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) align_disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) align_hover.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) bold_active.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) bold_hover.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) bullets_active.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) bullets_hover.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) center_active.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) center_hover.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) dec-font-size_active.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) dec-font-size_hover.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) inc-font-size_active.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) inc-font-size_hover.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) indent_active.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) indent_hover.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) italic_active.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) italic_hover.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) justify_active.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) justify_hover.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) left_active.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) left_hover.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) numbers_active.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) numbers_hover.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) object-popup_active.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) object-popup_disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) object-popup_hover.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) outdent_active.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) outdent_hover.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) right_active.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) right_hover.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) underline_active.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
+	$(MAKE_INSTALL) underline_hover.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images

themes/modern/global/MANIFEST

@@ -263,3 +263,6 @@ tab-top-border.gif
 tab-unselect-left.gif
 tab-unselect-middle.gif
 tab-unselect-right.gif
+progress-bg.gif
+progress-filler.gif
+

themes/modern/global/Makefile.in

@@ -115,6 +115,8 @@ EXPORT_RESOURCE_SAMPLES_1 = \
 	check-radio-check.gif \
 	check-radio-focused.gif \
 	check-radio-pressed.gif \
+	progress-bg.gif \
+	progress-filler.gif \
 	$(NULL)
 
 EXPORT_RESOURCE_SAMPLES_2 = \

themes/modern/global/button.css

@@ -70,6 +70,7 @@ button.plain-extended {}
     font-family			: charcoal, ms sans serif;
     font-weight			: normal;
     margin-right		: 2px;
+    margin-bottom		: 2px;
   }
 
   .button-image-right {

themes/modern/global/global.css

@@ -135,6 +135,8 @@
       padding			  : 0px;
       color				  : #D0E7E7;
       font-size			  : 10px;
+      min-width			  : 1px;      // DON'T DELETE.  Removes disappearance of scrollbars in content pane when window is made smaller.
+									  // Talk to evaughan@netscape.com for details.
     }
 
 /**
@@ -152,7 +154,7 @@
 /** 
  * XUL <progressmeter> 
  **/
-  progressmeter[mode="undetermined"] > .progressmeter-internal-box
+  progressmeter[mode="undetermined"]
     {
       background-image    : url(chrome://global/skin/progressmeter-busy.gif);
     }
@@ -168,31 +170,32 @@
   
   progressmeter 
     {
-      min-width           : 100px;
-      margin              : 0px 4px 0px 4px;
-      border              : 1px inset #CCCCCC;
+      min-width           : 128px;
+      margin              : 1px 4px 1px 4px;
+      border			  : 0px;
+      height			  : 11px;
     }
 
   progressmeter > .progressmeter-internal-box 
     {
-      border              : 1px solid #000000;
+    	height			  : 9px;
     }
 
 /* progress indicators */
   .progress-bar 
     {
-	  background-color    : #6699cc;
-      border-right        : 1px outset #6699cc;
+	  background	      : url(chrome://global/skin/progress-filler.gif) repeat-x;
+      //border-right        : 1px outset #6699cc;
     }
   
   .progress-remainder 
     {
-	  background-color    : #999999;
+	  background	      : url(chrome://global/skin/progress-bg.gif) repeat-x;
     }
 
   .progressmeter-statusbar 
     {
-      border              : 1px solid #999999;
+      //border              : 1px solid #999999;
       margin              : 0px 4px 0px 4px;
     }
 
@@ -204,15 +207,13 @@
     
   .progressmeter-progressbar[statusbar="true"] > .progress-bar
     {
-      background-color    : #999999;
+      //background-color    : #999999;
       border-right        : none;
     }
    
   .progressmeter-progressbar[statusbar="true"] > .progress-remainder
     {
-      background-color    : #CCCCCC;
-      //background	  		: url(chrome://global/skin/progressmeter.png) no-repeat center;  ///////****************///////
-      //width					: 120px;
+      //background-color    : #CCCCCC;
     }
     
 /** XUL <scrollbar> element **/

themes/modern/global/globalBindings.xml

@@ -29,10 +29,9 @@
   
   <binding id="toolbar-primary" extends="chrome://global/content/toolbarBindings.xml#toolbar">
   	<content>
-		<xul:box class="toolbar-primary-image-left">
-			<xul:toolbargrippy inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar"
+		<xul:toolbargrippy inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar"
 					onclick="this.grippyClicked();" tbattr="toolbar-grippy" class="toolbar-primary-grippy"/>
-		</xul:box> 
+		<xul:spring class="toolbar-primary-image-left"/> 
 		<xul:box flex="1" class="toolbar-primary-image-middle toolbar-holder" 
 			inherits="collapsed,last-toolbar,orient=tborient,autostretch=tbautostretch" autostretch="never">
 			<children/>

themes/modern/global/makefile.win

@@ -289,3 +289,5 @@ install::
 	$(MAKE_INSTALL) tab-unselect-left.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
 	$(MAKE_INSTALL) tab-unselect-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
 	$(MAKE_INSTALL) tab-unselect-right.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
+	$(MAKE_INSTALL) progress-bg.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
+	$(MAKE_INSTALL) progress-filler.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin

themes/modern/global/splitter.css

@@ -1,7 +1,7 @@
 /******* Splitters *******/
 
 /* vertical splitters */
-  window > splitter, box > splitter 
+  window > splitter, box > splitter, splitter
     {
       min-width             : 10px;
       border: none;
@@ -141,4 +141,4 @@
       background-image    : url("chrome://global/skin/grippy-vertical-before-h.gif");
     }  
     
-    
+    

themes/modern/global/tabcontrol.css

@@ -5,6 +5,7 @@ tab {
   -moz-binding		: url(chrome://global/skin/globalBindings.xml#tab);
   padding			: 0px;
   color				: #1C1D1F;
+  margin			: 0px;
 }
 
 .tab-image-left {
@@ -24,7 +25,7 @@ tab {
 }
 
 .tab-text {
-  padding			: 5px 0px 3px 0px;
+  padding			: 3px 0px 3px 0px;
   font-size			: 12px;
   font-family		: charcoal, ms sans serif;
 }
@@ -113,10 +114,6 @@ tabcontrol[align="vertical"] tabbox[align="horizontal"] tab {
   background		: url(chrome://global/skin/tab-bot-unselect-middle.gif) repeat-x;
 }
 
-.tab-bottom > .tab-image-middle > .tab-left {
-  padding			: 4px 0px;
-}
-
 .tab-bottom > .tab-image-right {
   background		: url(chrome://global/skin/tab-bot-unselect-right.gif) no-repeat;
   width				: 11px;
@@ -124,7 +121,7 @@ tabcontrol[align="vertical"] tabbox[align="horizontal"] tab {
 }
 
 .tab-bottom > .tab-image-middle > .tab-text {
-  padding			: 4px 0px 5px 0px;
+  padding			: 4px 0px 1px 0px;
 }
 
 .tab-bottom:hover:active > .tab-image-left { 

themes/modern/jar.mn

@@ -297,6 +297,8 @@ skins/modern.jar:
     global/skin/tab-unselect-left.gif                          (global/tab-unselect-left.gif)
     global/skin/tab-unselect-middle.gif                        (global/tab-unselect-middle.gif)
     global/skin/tab-unselect-right.gif                         (global/tab-unselect-right.gif)
+    global/skin/progress-filler.gif                            (global/progress-filler.gif)
+    global/skin/progress-bg.gif                         	   (global/progress-bg.gif)
     messenger/skin/AccountManager.css                          (messenger/AccountManager.css)
     messenger/skin/addtoab.gif                                 (messenger/addtoab.gif)
     messenger/skin/attach.gif                                  (messenger/attach.gif)
@@ -607,7 +609,7 @@ skins/modern.jar:
     editor/skin/images/newfile-hover.gif                       (editor/images/newfile-hover.gif)
     editor/skin/images/newfile-clicked.gif                     (editor/images/newfile-clicked.gif)
     editor/skin/images/openfile-clicked.gif                    (editor/images/openfile-clicked.gif)
-    editor/skin/images/openfile-hover.gif                    (editor/images/openfile-hover.gif)
+    editor/skin/images/openfile-hover.gif                      (editor/images/openfile-hover.gif)
     editor/skin/images/openfile-disabled.gif                   (editor/images/openfile-disabled.gif)
     editor/skin/images/preview-clicked.gif                     (editor/images/preview-clicked.gif)
     editor/skin/images/preview-disabled.gif                    (editor/images/editmode-toggle.gif)
@@ -618,6 +620,38 @@ skins/modern.jar:
     editor/skin/images/table-disabled.gif                      (editor/images/table-disabled.gif)
     editor/skin/images/table-hover.gif                         (editor/images/table-hover.gif)
     editor/skin/images/savefile-clicked.gif                    (editor/images/savefile-clicked.gif)
+    editor/skin/images/align_active.gif                  	   (editor/images/align_active.gif)
+    editor/skin/images/align_disabled.gif                      (editor/images/align_disabled.gif)
+    editor/skin/images/align_hover.gif                 		   (editor/images/align_hover.gif)
+    editor/skin/images/bold_active.gif               	       (editor/images/bold_active.gif)
+    editor/skin/images/bold_hover.gif               	       (editor/images/bold_hover.gif)
+    editor/skin/images/bullets_active.gif                      (editor/images/bullets_active.gif)
+    editor/skin/images/bullets_hover.gif                       (editor/images/bullets_hover.gif)
+    editor/skin/images/center_active.gif                       (editor/images/center_active.gif)
+    editor/skin/images/center_hover.gif                        (editor/images/center_hover.gif)
+    editor/skin/images/dec-font-size_active.gif                (editor/images/dec-font-size_active.gif)
+    editor/skin/images/dec-font-size_hover.gif                 (editor/images/dec-font-size_hover.gif)
+    editor/skin/images/inc-font-size_active.gif                (editor/images/inc-font-size_active.gif)
+    editor/skin/images/inc-font-size_hover.gif                 (editor/images/inc-font-size_hover.gif)
+    editor/skin/images/indent_active.gif                       (editor/images/indent_active.gif)
+    editor/skin/images/indent_hover.gif                        (editor/images/indent_hover.gif)
+    editor/skin/images/italic_active.gif                       (editor/images/italic_active.gif)
+    editor/skin/images/italic_hover.gif                        (editor/images/italic_hover.gif)
+    editor/skin/images/justify_active.gif                      (editor/images/justify_active.gif)
+    editor/skin/images/justify_hover.gif                       (editor/images/justify_hover.gif)
+    editor/skin/images/left_active.gif                         (editor/images/left_active.gif)
+    editor/skin/images/left_hover.gif                          (editor/images/left_hover.gif)
+    editor/skin/images/numbers_active.gif                      (editor/images/numbers_active.gif)
+    editor/skin/images/numbers_hover.gif                       (editor/images/numbers_hover.gif)
+    editor/skin/images/object-popup_active.gif                 (editor/images/object-popup_active.gif)
+    editor/skin/images/object-popup_disabled.gif               (editor/images/object-popup_disabled.gif)
+    editor/skin/images/object-popup_hover.gif                  (editor/images/object-popup_hover.gif)
+    editor/skin/images/outdent_active.gif                      (editor/images/outdent_active.gif)
+    editor/skin/images/outdent_hover.gif                       (editor/images/outdent_hover.gif)
+    editor/skin/images/right_active.gif                        (editor/images/right_active.gif)
+    editor/skin/images/right_hover.gif                         (editor/images/right_hover.gif)
+    editor/skin/images/underline_active.gif                    (editor/images/underline_active.gif)
+    editor/skin/images/underline_hover.gif                     (editor/images/underline_hover.gif)
     messenger/skin/addressbook/abnewmsg.gif                    (messenger/addressbook/abnewmsg.gif)
     messenger/skin/addressbook/addressbook.css                 (messenger/addressbook/addressbook.css)
     messenger/skin/addressbook/edit.gif                        (messenger/addressbook/edit.gif)

themes/modern/messenger/messengercompose/messengercompose.css

@@ -23,7 +23,7 @@ box.padded {
 /* Header toolbar */
 
 #MsgHeadersToolbar {
-	background-color	: #7B94B2;
+	background-color	: #394B6E;
 	border-top			: 2px solid #4C6484;
 	border-bottom		: 0px;
 	border-left			: 1px solid #48607E;
@@ -39,6 +39,11 @@ box.padded {
 	border-top			: 1px solid #B6CADF;
 }
 
+/* Text labels only for this window */
+
+.label {
+	color: #FFFFFF;
+}
 
 
 /* addressing widget */