update global in both themes to withstand a manual diff check

[themes.git] / LCARStrek / global / globalBindings.xml

diff --git a/LCARStrek/global/globalBindings.xml b/LCARStrek/global/globalBindings.xml
index 4eb76356d4a1bcd1e8070c1ba4ab73b1198149ef..04847c1d480560486f21a4fd49b5f895c9fcf8da 100755 (executable)
--- a/LCARStrek/global/globalBindings.xml
+++ b/LCARStrek/global/globalBindings.xml
@@ -40,6 +40,15 @@
     </content>
   </binding>
 
+  <binding id="toolbarpaletteitem-spacer"
+           extends="chrome://global/content/bindings/toolbar.xml#toolbarpaletteitem">
+    <content>
+      <xul:spacer class="spacer-left"/>
+      <children/>
+      <xul:spacer class="spacer-right"/>
+    </content>
+  </binding>
+
   <binding id="menulist-compact" display="xul:menu"
            extends="chrome://global/content/bindings/menulist.xml#menulist">
     <content sizetopopup="false">
@@ -52,7 +61,7 @@
   </binding>
 
 
-  <binding id="statusbar" extends="xul:statusbar">
+  <binding id="statusbar" extends="chrome://global/content/bindings/general.xml#statusbar">
     <content>
       <xul:box class="statusbar-left"/>
       <xul:hbox class="statusbar-center" autostretch="never" flex="1">
@@ -64,40 +73,77 @@
 
   <binding id="toolbar" extends="chrome://global/content/bindings/toolbar.xml#toolbar">
     <content>
-      <xul:toolbargrippy xbl:inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar,hidden=grippyhidden"
-                         tbattr="toolbar-grippy" class="toolbar-grippy"/>
-      <xul:hbox flex="1" class="toolbar-holder" align="center"
-               xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
-        <children/>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:vbox class="toolbar-startcap"/>
+        <xul:hbox flex="1" class="toolbar-holder" align="center"
+                  xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="toolbar-endcap"/>
       </xul:hbox>
-      <xul:hbox class="toolbar-endcap"/>
     </content>
   </binding>
 
-  <binding id="toolbar-primary" extends="chrome://global/content/bindings/toolbar.xml#toolbar-primary">
+  <binding id="menubar" extends="chrome://global/content/bindings/toolbar.xml#menubar">
+    <resources>
+      <stylesheet src="chrome://global/skin/toolbar.css"/>
+    </resources>
+
     <content>
-      <xul:toolbargrippy xbl:inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar,hidden=grippyhidden"
-                         tbattr="toolbar-grippy" class="toolbar-grippy"/>
-      <xul:hbox flex="1" class="toolbar-holder" align="center"
-               xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
-        <children/>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:vbox class="menubar-startcap"/>
+        <xul:hbox flex="1" class="toolbar-holder" xbl:inherits="collapsed,last-toolbar" align="center">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="menubar-endcap"/>
       </xul:hbox>
-      <xul:hbox class="toolbar-endcap"/>
     </content>
   </binding>
 
-  <binding id="menubar" extends="chrome://global/content/bindings/toolbar.xml#menubar">
+  <binding id="grippytoolbar" extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar">
+    <content>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:toolbargrippy xbl:inherits="last-toolbar,hidden=grippyhidden"
+                           tbattr="toolbar-grippy"
+                           class="toolbar-grippy"/>
+        <xul:hbox flex="1" class="toolbar-holder"
+                  xbl:inherits="collapsed,last-toolbar,orient,align,pack">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="toolbar-endcap"/>
+      </xul:hbox>
+    </content>
+  </binding>
+
+  <binding id="grippytoolbar-primary" extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary">
+    <content>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:toolbargrippy xbl:inherits="last-toolbar,hidden=grippyhidden"
+                           tbattr="toolbar-grippy"
+                           class="toolbar-grippy"/>
+        <xul:hbox flex="1" class="toolbar-holder"
+                  xbl:inherits="collapsed,last-toolbar,orient,align,pack">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="toolbar-endcap"/>
+      </xul:hbox>
+    </content>
+  </binding>
+
+  <binding id="grippymenubar" extends="chrome://communicator/content/bindings/toolbar.xml#grippymenubar">
     <resources>
       <stylesheet src="chrome://global/skin/toolbar.css"/>
     </resources>
 
     <content>
-      <xul:toolbargrippy xbl:inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar,hidden=grippyhidden"
-                         tbattr="toolbar-grippy" class="toolbar-grippy"/>
-      <xul:hbox flex="1" class="toolbar-holder" xbl:inherits="collapsed,last-toolbar" align="center">
-        <children/>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:toolbargrippy xbl:inherits="last-toolbar,hidden=grippyhidden"
+                           tbattr="toolbar-grippy" class="toolbar-grippy"/>
+        <xul:hbox flex="1" class="toolbar-holder" xbl:inherits="collapsed,last-toolbar">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="menubar-endcap"/>
       </xul:hbox>
-      <xul:hbox class="menubar-endcap"/>
     </content>
   </binding>