update global in both themes to withstand a manual diff check

diff --git a/EarlyBlue/global/globalBindings.xml b/EarlyBlue/global/globalBindings.xml
index 1c8166c81ed75876e1c84d71e1b6017098f5f980..b8ae09570ad86cbf3d17aa61d79eecb5d5577e4b 100644 (file)
--- 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 f820d42117632aac4291f81614ac2c2253ec25da..0b33ec265381bf6916fc4cf82d1f40192d9ffbc0 100644 (file)
--- 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 b8dafc85670a09d3cea6fce7f3f63772844bf2a1..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">

diff --git a/LCARStrek/global/media/videocontrols.css b/LCARStrek/global/media/videocontrols.css
index fa8cbfa343b6a0c3d2d213e1455ece3a73b6e782..783e0c2b0db2e1d18135908d8cd61466cb5dab78 100644 (file)
--- 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;
+}