From 4b1ccdb4c3b21dd1933b2e9e97a90f883dd833ef Mon Sep 17 00:00:00 2001
From: Robert Kaiser <robert@notebook.box.kairo.at>
Date: Fri, 1 Oct 2010 13:16:30 +0200
Subject: [PATCH 1/1] update global in both themes to withstand a manual diff
 check

---
 EarlyBlue/global/globalBindings.xml      |  9 +++++++++
 EarlyBlue/global/media/videocontrols.css | 25 ++++++++++++++++++++++++
 LCARStrek/global/globalBindings.xml      |  9 +++++++++
 LCARStrek/global/media/videocontrols.css | 25 ++++++++++++++++++++++++
 4 files changed, 68 insertions(+)

diff --git a/EarlyBlue/global/globalBindings.xml b/EarlyBlue/global/globalBindings.xml
index 1c8166c8..b8ae0957 100644
--- a/EarlyBlue/global/globalBindings.xml
+++ b/EarlyBlue/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">
diff --git a/EarlyBlue/global/media/videocontrols.css b/EarlyBlue/global/media/videocontrols.css
index f820d421..0b33ec26 100644
--- a/EarlyBlue/global/media/videocontrols.css
+++ b/EarlyBlue/global/media/videocontrols.css
@@ -180,3 +180,28 @@
 .statusIcon[type="error"] {
   background: url("chrome://global/skin/icons/alert-error.gif") no-repeat center;
 }
+
+/* CSS Transitions */
+.controlBar:not([immediate]) {
+  -moz-transition-property: opacity;
+  -moz-transition-duration: 200ms;
+}
+.controlBar[fadeout] {
+  opacity: 0;
+}
+.volumeStack:not([immediate]) {
+  -moz-transition-property: opacity, margin-top;
+  -moz-transition-duration: 200ms, 200ms;
+}
+.volumeStack[fadeout] {
+  opacity: 0;
+  margin-top: 0;
+}
+.statusOverlay:not([immediate]) {
+  -moz-transition-property: opacity;
+  -moz-transition-duration: 300ms;
+  -moz-transition-delay: 750ms;
+}
+.statusOverlay[fadeout] {
+  opacity: 0;
+}
diff --git a/LCARStrek/global/globalBindings.xml b/LCARStrek/global/globalBindings.xml
index b8dafc85..04847c1d 100755
--- 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">
diff --git a/LCARStrek/global/media/videocontrols.css b/LCARStrek/global/media/videocontrols.css
index fa8cbfa3..783e0c2b 100644
--- a/LCARStrek/global/media/videocontrols.css
+++ b/LCARStrek/global/media/videocontrols.css
@@ -206,3 +206,28 @@
 .statusIcon[type="error"] {
   background: url("chrome://global/skin/icons/alert-error.gif") no-repeat center;
 }
+
+/* CSS Transitions */
+.controlBar:not([immediate]) {
+  -moz-transition-property: opacity;
+  -moz-transition-duration: 200ms;
+}
+.controlBar[fadeout] {
+  opacity: 0;
+}
+.volumeStack:not([immediate]) {
+  -moz-transition-property: opacity, margin-top;
+  -moz-transition-duration: 200ms, 200ms;
+}
+.volumeStack[fadeout] {
+  opacity: 0;
+  margin-top: 0;
+}
+.statusOverlay:not([immediate]) {
+  -moz-transition-property: opacity;
+  -moz-transition-duration: 300ms;
+  -moz-transition-delay: 750ms;
+}
+.statusOverlay[fadeout] {
+  opacity: 0;
+}
-- 
2.35.3