From: Robert Kaiser Date: Fri, 1 Oct 2010 11:16:30 +0000 (+0200) Subject: update global in both themes to withstand a manual diff check X-Git-Tag: LCARStrek-2.1b1~7 X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=4b1ccdb4c3b21dd1933b2e9e97a90f883dd833ef;p=themes.git update global in both themes to withstand a manual diff check --- 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 @@ + + + + + + + + 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 @@ + + + + + + + + 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; +}