X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fglobal%2FglobalBindings.xml;h=b8dafc85670a09d3cea6fce7f3f63772844bf2a1;hp=b248396e22aa84dbc78e2333405c0bb2376d82bf;hb=d0646e4a75a2e7c90b075456d6bab4a0b0d8ab6f;hpb=dd676468138b64245f5026a8923f26307b8f3ebc

diff --git a/LCARStrek/global/globalBindings.xml b/LCARStrek/global/globalBindings.xml
index b248396e..b8dafc85 100755
--- a/LCARStrek/global/globalBindings.xml
+++ b/LCARStrek/global/globalBindings.xml
@@ -52,7 +52,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,12 +64,14 @@
 
   <binding id="toolbar" extends="chrome://global/content/bindings/toolbar.xml#toolbar">
     <content>
-      <xul:hbox 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 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>
 
@@ -79,35 +81,43 @@
     </resources>
 
     <content>
-      <xul:hbox class="menubar-startcap"/>
-      <xul:hbox flex="1" class="toolbar-holder" xbl:inherits="collapsed,last-toolbar" align="center">
-        <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="menubar-endcap"/>
     </content>
   </binding>
 
   <binding id="grippytoolbar" extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar">
     <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: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>
-      <xul:hbox class="toolbar-endcap"/>
     </content>
   </binding>
 
   <binding id="grippytoolbar-primary" extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary">
     <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: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>
-      <xul:hbox class="toolbar-endcap"/>
     </content>
   </binding>
 
@@ -117,12 +127,14 @@
     </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>