update global in both themes to withstand a manual diff check

[themes.git] / LCARStrek / global / media / videocontrols.css

diff --git a/LCARStrek/global/media/videocontrols.css b/LCARStrek/global/media/videocontrols.css
index 474933d6ae4679b1701cbc73b150053013a450ee..783e0c2b0db2e1d18135908d8cd61466cb5dab78 100644 (file)
--- a/LCARStrek/global/media/videocontrols.css
+++ b/LCARStrek/global/media/videocontrols.css
@@ -26,8 +26,8 @@
 .playButton:hover, .muteButton:hover {
   background-color: rgba(255,207,0,0.75);
 }
-.playButton:focus > .button-box,
-.muteButton:focus > .button-box {
+.playButton:-moz-focusring > .button-box,
+.muteButton:-moz-focusring > .button-box {
   border: 1px dotted rgba(0,0,0,0.75);
 }
 
@@ -89,7 +89,7 @@
   /* margin left/right: make bar 8px wide (control width = 28, minus 2 * 10 margin) */
   margin: 0px 10px;
   background-color: rgba(0,0,0,0.5);
-  -moz-border-radius: 4px 4px;
+  border-radius: 4px 4px;
 }
 
 
@@ -102,7 +102,8 @@
   padding-left: 8px; /* don't bump into the scrubber bar */
   padding-top: 0px; /* center vertically with scrubber bar */
   color: rgba(0,0,0,0.75);
-  font: 11px sans-serif;
+  font-size: 11px;
+  font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
 }
 
 .backgroundBar {
@@ -110,7 +111,7 @@
   /* margin left/right: 1/2 of scrubber thumb width, for overhang. */
   margin: 10px 22px;
   background-color: rgba(0,0,0,0.75);
-  -moz-border-radius: 4px 4px;
+  border-radius: 4px 4px;
 }
 
 .bufferBar, .progressBar {
@@ -131,13 +132,13 @@
    * compositing gives it a different visual appearance.
    */
   background-color: rgba(255,159,0,0.75);
-  -moz-border-radius: 4px 4px;
+  border-radius: 4px 4px;
   -moz-appearance: none;
 }
 
 .progressBar .progress-bar {
   background-color: #008484;
-  -moz-border-radius: 4px 0px 0px 4px;
+  border-radius: 4px 0px 0px 4px;
   -moz-appearance: none;
 }
 
@@ -149,9 +150,9 @@
 }
 
 .scrubber .scale-slider {
-    /* abs(margin-top) + margin-bottom + bar height == timeThumb height */
-    margin-top: -9px;
-    margin-bottom: 10px;
+  /* abs(margin-top) + margin-bottom + bar height == timeThumb height */
+  margin-top: -10px;
+  margin-bottom: 10px;
 }
 
 /* .scale-thumb is an element inside the <scale> implementation. */
@@ -164,7 +165,7 @@
 .timeThumb {
   background: url("chrome://global/skin/media/scrubberThumb.png") no-repeat center;
   min-width: 45px;
-  min-height: 27px;
+  min-height: 28px;
   -moz-box-pack: center;
 }
 
@@ -179,30 +180,54 @@
 */
 
 .timeLabel {
-    color: rgba(0,0,0,0.75);
-    font: 10px sans-serif;
-    text-shadow: rgba(255,259,0, 0.3) 0 1px;
-    padding-top: 2px;
-}
-
-.timeThumb[showhours="true"] > .timeLabel {
-    padding-top: 1px;
+  color: rgba(0,0,0,0.75);
+  font-size: 10px;
+  font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
+  text-shadow: rgba(255,259,0, 0.3) 0 1px;
+  padding-top: 2px;
 }
 
 .statusOverlay {
-    background-color: rgba(0,0,0,0.55);
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  background-color: rgba(0,0,0,0.55);
 }
 
 .statusIcon {
-    margin-bottom: 28px; /* same height as .controlBar, to keep icon centered above it */
-    width: 36px;
-    height: 36px;
+  margin-bottom: 28px; /* same height as .controlBar, to keep icon centered above it */
+  width: 36px;
+  height: 36px;
 }
 
 .statusIcon[type="throbber"] {
-    background: url("chrome://communicator/skin/brand/throbber-anim.gif") no-repeat center;
+  background: url("chrome://communicator/skin/brand/throbber-anim.gif") no-repeat center;
 }
 
 .statusIcon[type="error"] {
-    background: url("chrome://global/skin/icons/alert-error.gif") no-repeat center;
+  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;
 }