#46423 - New Modern Skin Polish. Final batch of navigation bar images, other minor color tweaks. NOT PART OF BUILD. r=marlon

themes/modern/communicator/brand.css

@@ -3,7 +3,7 @@
   {
     behavior              : url("chrome://global/content/xulBindings.xml#buttontop");
     list-style-image      : url("chrome://global/skin/animthrob_single.gif");
-    margin                : 3px 1px 6px 8px;
+    margin                : 5px 1px 9px 8px;
     padding               : 0px;
     cursor                : pointer;
     border                : 0px;

themes/modern/communicator/button.css

@@ -75,9 +75,7 @@
   .button-toolbar-1
     {
       color               : #CCFFFF;
-      width               : 34px;
-      height              : 34px;
-      margin              : 4px 6px 8px 1px;
+      margin              : 3px 3px 9px 3px;
       font-size           : smaller;
       border              : 0px;
       padding			  : 0px;
@@ -100,7 +98,7 @@
   .button-toolbar-1[disabled="true"]:hover,
   .button-toolbar-1[disabled="true"]:hover:active
     {
-      margin              : 0px 6px 4px 1px;
+      margin              : 3px 3px 9px 3px;
       border              : none;
     }
     
@@ -195,17 +193,17 @@
 /** "Green" buttons, e.g. "Search"
  *  class="button-toolbar-3"
  **/  
-  .button-toolbar-3 
+  button.button-toolbar-3 
     {
 	  behavior			    : url("chrome://global/skin/globalBindings.xml#three-slice-button");
       font-weight           : bold;
       background-color      : transparent;
       border				: 0px;
-      margin				: 2px 7px 3px 0px;
+      margin				: 3px 7px 3px 0px;
       color					: #2F405D;
     }
 
-  .button-toolbar-3[disabled="true"], .button-toolbar-3[disabled="true"]:hover, .button-toolbar-3[disabled="true"]:hover:active
+  button.button-toolbar-3[disabled="true"], .button-toolbar-3[disabled="true"]:hover, .button-toolbar-3[disabled="true"]:hover:active
     {
       border				: 0px;
     }
@@ -229,7 +227,7 @@
 
   .three-slice-button-image-right {
 	background			: url(chrome://global/skin/button-3slice-normal-right.png) no-repeat;
-	width				: 5px;
+	width				: 4px;
 	height				: 20px;
   }
 
@@ -238,22 +236,22 @@
   }
 
   .three-slice-button-bottom-spring {
-	height				: 2px;
+	height				: 3px;
   }
   
-  .button-toolbar-3:hover:active {
+  button.button-toolbar-3:hover:active {
   	color				: #B2CAC9;
   }
   
-  .button-toolbar-3:hover:active > .three-slice-button-image-left {
+  button.button-toolbar-3:hover:active > .three-slice-button-image-left {
 	background			: url(chrome://global/skin/button-3slice-active-left.png) no-repeat;
   }
 
-  .button-toolbar-3:hover:active > .three-slice-button-image-middle {
+  button.button-toolbar-3:hover:active > .three-slice-button-image-middle {
 	background			: url(chrome://global/skin/button-3slice-active-middle.png) repeat-x;
   }
 
-  .button-toolbar-3:hover:active > .three-slice-button-image-right {
+  button.button-toolbar-3:hover:active > .three-slice-button-image-right {
 	background			: url(chrome://global/skin/button-3slice-active-right.png) no-repeat;
   }
   
@@ -305,7 +303,7 @@
     font                  : inherit;
     border                : none;
     padding               : 1px;
-    margin                : 0px 8px;
+    margin                : 0px;
   }
 
 .button-toolbar-4:hover 

themes/modern/communicator/menubutton.css

@@ -5,6 +5,7 @@
   .button-toolbar-3 > .menubutton-icon-internal-box
     {
       border                : 1px outset #99CCCC;
+      
     }
 
   .button-toolbar-3[open="true"] > .menubutton-icon-internal-box,
@@ -16,6 +17,7 @@
   menupopup.button-toolbar-3 
     {
       border                : 1px solid #000000;
+      background			: #B2CAC9;
     }
   
   menuitem.button-toolbar-3 
@@ -59,8 +61,8 @@
 .menubutton-dual.toolbar
   {
     behavior                : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-dual-foo");
-    border                  : 0px;
-    margin      	        : 4px 6px 8px 1px;
+    border                  : 0px solid red;
+    margin      	        : 3px 3px 9px 3px;
     padding					: 0px;
   }
 
@@ -68,12 +70,13 @@
 .menubutton-dual.toolbar[disabled="true"]:hover,
 .menubutton-dual.toolbar[disabled="true"]:hover:active
   {
-    margin                  : 0px 6px 4px 1px;
+    margin      	        : 3px 3px 9px 3px;
 	padding					: 0px;
   }
 
 .button-toolbar-1.menubutton-dual-button,
 .button-toolbar-1.menubutton-dual-button[disabled="true"],
+.button-toolbar-1.menubutton-dual-button[disabled="true"]:hover,
 .button-toolbar-1.menubutton-dual-button[disabled="true"]:hover:active
   {
     list-style-image        : inherit;
@@ -120,7 +123,7 @@
 .menubutton-dual-dropmarker-box
   {
     margin-left             : 23px;
-    margin-top				: 25px;
+    margin-top				: 26px;
   }
   
 .button-toolbar-2 + .menubutton-dual-dropmarker-box  

themes/modern/communicator/securityOverlay.css

@@ -1,6 +1,7 @@
 #security-button 
   {
     list-style-image:url("chrome://communicator/skin/unlock.gif");
+    margin-right	:14px;
   }
 
 #security-button[level="high"] 

themes/modern/global/formatting.css

@@ -72,15 +72,17 @@
   separator.groove,
   separator.groove[orient="horizontal"] 
     {
-      border-top: 2px groove #CCCCCC;
-      height: 0px;
-      margin-top: 0.4em;
-      margin-bottom: 0.4em;
+      border-top: 1px solid #172254;
+      border-bottom: 1px solid #5A518A;
+      max-height: 2px;
+      margin-top: 2px;
+      margin-bottom: 2px;
     }
   
   separator.groove[orient="vertical"] 
     {
-      border-left: 2px groove #CCCCCC;
+      border-left: 1px solid #172254;
+      border-right: 1px solid #5A518A;
       margin-left: 0.4em;
       margin-right: 0.4em;
     }
@@ -138,4 +140,4 @@
   .spaced
     {
       margin              : 3px 5px 4px 5px;
-    }    
+    }    

themes/modern/global/global.css

@@ -127,7 +127,7 @@
   #status-bar 
     {
       border-top          : 1px solid #11151F;
-      background-color    : #647B9F;
+      background-color    : #6D88AA;
       user-focus          : ignore;
       overflow            : hidden;
       margin			  : 0px;
@@ -197,25 +197,25 @@
 /* progress indicators */
   .progress-bar 
     {
-	    background-color    : #6699cc;
+	  background-color    : #6699cc;
       border-right        : 1px outset #6699cc;
     }
   
   .progress-remainder 
     {
-	    background-color    : #999999;
+	  background-color    : #999999;
     }
 
   .progressmeter-statusbar 
     {
       border              : 1px solid #999999;
-      margin              : 1px 4px 1px 4px;
+      margin              : 0px 4px 0px 4px;
     }
 
   .progressmeter-statusbar > .progressmeter-internal-box
     {
-      border              : none;
-      padding             : 1px;
+      border              : 0px;
+      padding             : 0px;
     }
     
   .progressmeter-progressbar[statusbar="true"] > .progress-bar
@@ -227,6 +227,8 @@
   .progressmeter-progressbar[statusbar="true"] > .progress-remainder
     {
       background-color    : #CCCCCC;
+      //background	  		: url(chrome://global/skin/progressmeter.png) no-repeat center;  ///////****************///////
+      //width					: 120px;
     }
     
 /** XUL <scrollbar> element **/

themes/modern/global/globalBindings.xml

@@ -75,14 +75,14 @@
     <content excludes="observes,template">
         <xul:spring class="three-slice-button-image-left" inherits="default,disabled"/>
     	<xul:box flex="1" class="three-slice-button-image-middle" inherits="default,disabled" orient="vertical" align="center">
-    	  <xul:spring flex="1" class="three-slice-button-top-spring"/>
-    	  <xul:box flex="1">
-    	  	<xul:image class="three-slice-button-icon" inherits="src"/>
-    	    <xul:box class="three-slice-button-text-box" flex="1">
-		      <xul:text inherits="disabled,value,crop,accesskey"/>
+    	  	<xul:spring flex="1" class="three-slice-button-top-spring"/>
+    	  	<xul:box flex="1">
+    	  		<xul:image class="three-slice-button-icon" inherits="src"/>
+    	    	<xul:box class="three-slice-button-text-box" flex="1">
+		      		<xul:text inherits="disabled,value,crop,accesskey"/>
+    	    	</xul:box>
     	    </xul:box>
-    	  </xul:box>
-    	  <xul:spring flex="1" class="three-slice-button-bottom-spring"/>
+		    <xul:spring flex="1" class="three-slice-button-bottom-spring"/>
     	</xul:box>
     	<xul:spring class="three-slice-button-image-right" inherits="default,disabled"/>
     </content>
@@ -90,31 +90,20 @@
 
   <binding id="taskbar" extends="xul:box">
   	<content>
-  	  <xul:stack flex="1">
-  	  	<xul:box flex="1" class="taskbar-bg-images">
-        	<xul:box class="taskbar-image-left"/>
-    		<xul:box flex="1" class="taskbar-image-middle"/>
-    	   	<xul:box class="taskbar-image-right"/>
-    	</xul:box>
-    	<xul:box flex="1">
-       		<children/>
-      	</xul:box>
-      </xul:stack>
+        <xul:box flex="1" class="taskbar-image-middle">
+        	  <children/>
+        </xul:box>
+        <xul:spring class="taskbar-image-right"/>
     </content>
   </binding>
 
   <binding id="taskbar-menu-box" extends="xul:box">
   	<content>
-  	  <xul:stack flex="1">
-  	  	<xul:box flex="1" class="taskbar-mb-images">
-        	<xul:box class="taskbar-mb-image-left"/>
-    		<xul:box flex="1" class="taskbar-mb-image-middle"/>
-    	   	<xul:box class="taskbar-mb-image-right"/>
-    	</xul:box>
-    	<xul:box flex="1">
-       		<children/>
-      	</xul:box>
-      </xul:stack>
+  		<xul:spring class="taskbar-mb-image-left"/>
+        <xul:box flex="1" class="taskbar-mb-image-middle">
+        	  <children/>
+        </xul:box>
+        <xul:spring class="taskbar-mb-image-right"/>
     </content>
   </binding>
 

themes/modern/navigator/navigator.css

@@ -140,7 +140,7 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
   {
     behavior              : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-dual-foo");
     list-style-image      : url("chrome://global/skin/print.png");
-    margin-left			  : 4px;
+	margin				  : 7px 6px 10px 6px;
   }
 
 #print-button[disabled="true"],
@@ -163,6 +163,12 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
     list-style-image      : url("chrome://global/skin/print-clicked.png");
   }
 
+#print-button > .menubutton-dual-stack > .menubutton-dual-dropmarker-box
+  {
+    margin-left             : 18px;
+    margin-top				: 21px;
+  }
+
 
 /*all the urlbar stuff*/
 
@@ -184,21 +190,21 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
 
 .navbar-inner-border-outer
   {
-  	border-top			  : 1px solid #8191AA;
-  	border-bottom		  : 1px solid #66799B;
+  	border-top			  : 1px solid #A0B3C6;
+  	border-bottom		  : 1px solid #7C92AF;
   	height				  : 31px;
   }
 
 .navbar-inner-border-middle
   {
-  	border-top			  : 1px solid #9CACC7;
-  	border-bottom		  : 1px solid #4E5F7A;
+  	border-top			  : 1px solid #7D91AA;
+  	border-bottom		  : 1px solid #4E6179;
   }
  
 .navbar-inner-border-inner
   {
-  	border-top			  : 1px solid #AEBED6;
-  	border-bottom		  : 1px solid #415171;
+  	border-top			  : 1px solid #BBCCE2;
+  	border-bottom		  : 1px solid #556D8B;
   }
 	
 .navbar-inner-groove-image-right
@@ -217,24 +223,24 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
 .urlbar-image-left
   {
   	background			  : url("chrome://navigator/skin/urlbar-left.png") no-repeat;
-  	width				  : 4px;
+  	width				  : 3px;
   	height				  : 18px;
   }
 
 .urlbar-border-outer
   {
-  	border-top			  : 1px solid #424242;
+  	border-top			  : 1px solid #65696D;
   }
 
 .urlbar-border-inner
   {
-  	border-top			  : 1px solid #CACAC9;
+  	border-top			  : 1px solid #A3A3A3;
   }
   
 .urlbar-image-right
   {
   	background			  : url("chrome://navigator/skin/urlbar-right.png") no-repeat;
-  	width				  : 3px;
+  	width				  : 4px;
   	height				  : 18px;
   }
 
@@ -260,7 +266,7 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
 
 #ubhist-keyword-popup
   {
-    margin                : 0px 4px 0px 0px;
+    margin                : 3px 4px 8px 3px;
     width                 : 10px; 
     list-style-image      : url("chrome://navigator/skin/ubhist-keyword-popup.png");
     background-color	  : transparent;
@@ -274,7 +280,7 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
 
 #ubhist-keyword-popup:hover:active
   {
-    margin                : 0px 4px 0px 0px;
+    margin                : 3px 4px 8px 3px;
     width                 : 10px; 
     list-style-image      : url("chrome://navigator/skin/ubhist-keyword-popup-active.png"); 
   } 
@@ -315,7 +321,9 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
 
 #statusbar-display
   {
-    list-style-image      : url("chrome://communicator/skin/document.gif"):
+    list-style-image      : url("chrome://communicator/skin/document.gif");
+    font-size			  : 9px;
+    color				  : #D0E7E7;
   }
   
 #statusbar-display[error="true"]