113039 - [modern] simplify primary toolbar xbl and css, r=ben, sr=hyatt

themes/modern/communicator/brand.css

@@ -43,8 +43,9 @@
   list-style-image: url("chrome://communicator/skin/brand/throbber-anim.gif");
 }
 
-#throbber-box,
-.throbber-internal-box {
-  -moz-box-align: start !important;
-}  
+#throbber-box {
+  -moz-box-align: start;
+  padding-left: 8px;
+  background: url("chrome://communicator/skin/toolbar/prtb-bg-noline.gif") #B1BDC9 repeat-x top;
+}
 

themes/modern/communicator/brand/brandBindings.xml

@@ -10,18 +10,4 @@
     </content>
   </binding>
 
-  <binding id="throbber-fancy" extends="chrome://global/content/bindings/general.xml#basetext">
-  	<content>
-      <xul:vbox class="throbber-internal-box" flex="1">
-       	<xul:spacer class="throbber-groove-top"/>
-    	  <xul:hbox class="throbber-middle">
-      	  <xul:spacer class="throbber-groove-left"/>
-    	  	<xul:image class="throbber-icon" inherits="src"/>
-    	  	<xul:spacer class="throbber-groove-right"/>
-    	  </xul:hbox>
-    	  <xul:spacer class="throbber-groove-bottom"/>
-      </xul:vbox>
-    </content>
-  </binding>
-
 </bindings>

themes/modern/communicator/toolbar.css

@@ -32,13 +32,15 @@
 .toolbar-primary {
   -moz-binding: url("chrome://communicator/skin/toolbar/toolbarBindings.xml#toolbar-primary");
   min-height: 45px;
-  background-image: none;
   background-color: #B1BDC9;
 }
 
-.toolbar-primary > .toolbar-holder {
-  border: none;
+.toolbar-primary-holder {
+  background: url("chrome://communicator/skin/toolbar/prtb-bg-line.gif") repeat-x top;
+  border-top: none;
+  border-right: 1px solid #95A0AD;
   border-bottom: 1px solid #95A0AD;
+  border-left: none;
 }
 
 .toolbar-primary-icon {
@@ -48,34 +50,6 @@
   background-position: top;
 }
 
-.toolbar-primary-mid-top {
-  height: 36px;
-  background: url("chrome://communicator/skin/toolbar/prtb-mid-top.gif") repeat-x top;
-}
-  
-.toolbar-primary-mid-btm {
-  height: 5px;
-  background: url("chrome://communicator/skin/toolbar/prtb-mid-btm.gif") repeat-x bottom;
-}
-
-.toolbar-primary-right {
-  width: 52px;
-}
-
-.toolbar-primary-right-top {
-  height: 36px;
-  background: url("chrome://communicator/skin/toolbar/prtb-rit-top.gif") no-repeat;
-}
-  
-.toolbar-primary-right-mid {
-  background: url("chrome://communicator/skin/toolbar/prtb-rit-mid.gif") repeat-y;
-}
-  
-.toolbar-primary-right-btm {
-  height: 5px;
-  background: url("chrome://communicator/skin/toolbar/prtb-rit-btm.gif") no-repeat;
-}
-
 /* ::::: toolbargrippy ::::: */
  
 .toolbar-primary-grippy { 

themes/modern/communicator/toolbar/toolbarBindings.xml

@@ -8,25 +8,9 @@
     <content>
       <xul:toolbargrippy inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar"
           tbattr="toolbar-grippy" class="toolbar-primary-grippy"/>
-      <xul:hbox class="toolbar-holder" flex="1">
-        <xul:hbox class="toolbar-primary-icon"/>
-        <xul:stack class="toolbar-primary-mid" flex="1">
-          <xul:hbox class="toolbar-primary-mid-2" flex="1">
-            <xul:vbox class="toolbar-primary-mid-bg" flex="1">
-              <xul:spacer class="toolbar-primary-mid-top" flex="1"/> 
-              <xul:spacer class="toolbar-primary-mid-btm"/> 
-            </xul:vbox>
-            <xul:vbox class="toolbar-primary-right">
-              <xul:spacer class="toolbar-primary-right-top"/> 
-              <xul:spacer class="toolbar-primary-right-mid" flex="1"/> 
-              <xul:spacer class="toolbar-primary-right-btm"/> 
-            </xul:vbox>
-          </xul:hbox>
-          <xul:hbox class="toolbar-primary-mid-fg"
-                   inherits="collapsed,last-toolbar,orient=tborient">
-            <children/>
-          </xul:hbox>
-        </xul:stack>
+      <xul:hbox class="toolbar-holder toolbar-primary-holder" flex="1" inherits="orient=tborient">
+        <xul:image class="toolbar-primary-icon"/>
+        <children/>
       </xul:hbox>
     </content>
   </binding>

themes/modern/jar.mn

@@ -115,11 +115,8 @@ modern.jar:
   skin/modern/communicator/toolbar/prtb-grip-top-act.gif           (communicator/toolbar/prtb-grip-top-act.gif)
   skin/modern/communicator/toolbar/prtb-grip-mid-act.gif           (communicator/toolbar/prtb-grip-mid-act.gif)
   skin/modern/communicator/toolbar/prtb-grip-btm-act.gif           (communicator/toolbar/prtb-grip-btm-act.gif)
-  skin/modern/communicator/toolbar/prtb-mid-btm.gif                (communicator/toolbar/prtb-mid-btm.gif)
-  skin/modern/communicator/toolbar/prtb-mid-top.gif                (communicator/toolbar/prtb-mid-top.gif)
-  skin/modern/communicator/toolbar/prtb-rit-btm.gif                (communicator/toolbar/prtb-rit-btm.gif)
-  skin/modern/communicator/toolbar/prtb-rit-mid.gif                (communicator/toolbar/prtb-rit-mid.gif)
-  skin/modern/communicator/toolbar/prtb-rit-top.gif                (communicator/toolbar/prtb-rit-top.gif)
+  skin/modern/communicator/toolbar/prtb-bg-line.gif                (communicator/toolbar/prtb-bg-line.gif)
+  skin/modern/communicator/toolbar/prtb-bg-noline.gif              (communicator/toolbar/prtb-bg-noline.gif)
   skin/modern/communicator/toolbar/toolbarBindings.xml             (communicator/toolbar/toolbarBindings.xml)
   skin/modern/communicator/xpinstall/xpinstall.css                 (communicator/xpinstall/xpinstall.css)
   skin/modern/editor/contents.rdf                                  (editor/contents.rdf)
@@ -778,7 +775,6 @@ 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/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)
   skin/modern/navigator/toolbar/nav-groove-lft-top.gif             (navigator/toolbar/nav-groove-lft-top.gif)

themes/modern/navigator/navigator.css

@@ -163,16 +163,12 @@
 /* ::::: nav-bar - the navigator primary toolbar ::::: */
 
 .toolbar-primary-icon {
-  width: 0px;
-  height: 0px;
+  display: none;
 }
 
-.toolbar-primary-mid-fg {
+.toolbar-primary-holder {
   -moz-box-align: start;
-}
-
-.toolbar-primary-mid-top {
-  background-image: url("chrome://navigator/skin/toolbar/navbar-mid-top.gif");
+  background-image: url("chrome://communicator/skin/toolbar/prtb-bg-noline.gif");
 }
 
 #nav-bar-buttons {
@@ -376,13 +372,8 @@
 
 /* ::::: navigator throbber ::::: */
 
-#navigator-throbber {
-  margin: 5px 15px 0px 8px;
-  list-style-image: url("chrome://communicator/skin/brand/throbber-single.gif");
-}
-
-#navigator-throbber[busy="true"] {
-  list-style-image: url("chrome://communicator/skin/brand/throbber-anim.gif");
+#throbber-box {
+  background: none;
 }
 
 /* ::::: autocomplete ::::: */