update for toolkit winstripe changes until 2009-01-30: video controls now include...

diff --git a/EarlyBlue/global/media/muteButton.png b/EarlyBlue/global/media/muteButton.png
index 082ebba032363c16b7c2413702eaca0596cb6e33..3ad97273083a962523164af28ffb03f5bdbee41e 100644 (file)
Binary files a/EarlyBlue/global/media/muteButton.png and b/EarlyBlue/global/media/muteButton.png differ

diff --git a/EarlyBlue/global/media/pauseButton.png b/EarlyBlue/global/media/pauseButton.png
index 5d3bd664da434ca8fb00cb23ebe4342f41f896c0..c71622072fef2fbc320b63768f8bec618f43cc89 100644 (file)
Binary files a/EarlyBlue/global/media/pauseButton.png and b/EarlyBlue/global/media/pauseButton.png differ

diff --git a/EarlyBlue/global/media/playButton.png b/EarlyBlue/global/media/playButton.png
index 3ecb4fe4c47f74a4dd4ace6bb77654d748781fa5..d6f8d345708bdd5d8f5ec3e4456c5fe2e35b58f7 100644 (file)
Binary files a/EarlyBlue/global/media/playButton.png and b/EarlyBlue/global/media/playButton.png differ

diff --git a/EarlyBlue/global/media/scrubberThumb.png b/EarlyBlue/global/media/scrubberThumb.png
new file mode 100644 (file)
index 0000000..bac1b1a
Binary files /dev/null and b/EarlyBlue/global/media/scrubberThumb.png differ

diff --git a/EarlyBlue/global/media/unmuteButton.png b/EarlyBlue/global/media/unmuteButton.png
index a2b1a337324bf983acb0fc273df1155c0036018a..d4d4c0bf8cf53a467c81cd4fdffd8f147fdb69f2 100644 (file)
Binary files a/EarlyBlue/global/media/unmuteButton.png and b/EarlyBlue/global/media/unmuteButton.png differ

diff --git a/EarlyBlue/global/media/videocontrols.css b/EarlyBlue/global/media/videocontrols.css
index 23cd9ff9df5bd1c66d879f40fae30ecbe5a50239..371a98e3e0714b7879b210d04b961171215c37a0 100644 (file)
--- a/EarlyBlue/global/media/videocontrols.css
+++ b/EarlyBlue/global/media/videocontrols.css
@@ -1,7 +1,7 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 .controlBar {
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 .controlBar {

-  height: 24px;
+  height: 28px;

   background-color: rgba(102,102,153,0.75);
 }
 
   background-color: rgba(102,102,153,0.75);
 }
 


@@ -10,20 +10,75 @@
   margin: 0px;
   padding: 0px;
   border: none;
   margin: 0px;
   padding: 0px;
   border: none;

-  min-height: 24px;
-  min-width: 24px;
+  min-height: 28px;
+  background-color: transparent;
+  background-repeat: no-repeat;
+  background-position: center center;
+}
+.playButton {
+  min-width: 28px;
+}
+.muteButton {
+  min-width: 33px;

 }
 
 .playButton {
 }
 
 .playButton {

-  background: url("chrome://global/skin/media/pauseButton.png") no-repeat center;
+  background-image: url("chrome://global/skin/media/pauseButton.png");

 }
 .playButton[paused="true"] {
 }
 .playButton[paused="true"] {

-  background: url("chrome://global/skin/media/playButton.png") no-repeat center;
+  background-image: url("chrome://global/skin/media/playButton.png");

 }
 
 .muteButton {
 }
 
 .muteButton {

-  background: url("chrome://global/skin/media/muteButton.png") no-repeat center;
+  background-image: url("chrome://global/skin/media/muteButton.png");

 }
 .muteButton[muted="true"] {
 }
 .muteButton[muted="true"] {

-  background: url("chrome://global/skin/media/unmuteButton.png") no-repeat center;
+  background-image: url("chrome://global/skin/media/unmuteButton.png");
+}
+
+.backgroundBar {
+  /* make bar 8px tall (control height = 28, minus 2 * 10 margin) */
+  margin: 10px 2px;
+  background-color: rgba(0,0,0,0.75);
+}
+
+.bufferBar, .progressBar {
+  /* make bar 8px tall (control height = 28, minus 2 * 10 margin) */
+  margin: 10px 2px;
+  border: none;
+  background-color: transparent;
+  min-width: 0px;
+  min-height: 0px;
+}
+
+/* .progress-bar is an element inside the <progressmeter> implementation. */
+.bufferBar .progress-bar {
+  /*
+   * Note that this is drawn on top of the .backgroundBar. So although this
+   * has the same background-color specified, the semitransparent
+   * compositing gives it a different visual appearance.
+   */
+  background-color: rgba(204,208,221,0.75);
+  -moz-appearance: none;
+}
+
+.progressBar .progress-bar {
+  background-color: #336699;
+  -moz-appearance: none;
+}
+
+/* .scale-slider is an element inside the <scale> implementation. */
+.scale-slider {
+  /* Hide the default horizontal bar. */
+  background: none;
+  margin: 0 2px;
+}
+
+/* .scale-thumb is an element inside the <scale> implementation. */
+.scale-thumb {
+  /* Override the default thumb appearance with a custom image. */
+  background: url("chrome://global/skin/media/scrubberThumb.png") no-repeat center;
+  border: none !important;
+  min-width: 11px;
+  min-height: 20px;

 }
 }

diff --git a/EarlyBlue/global/scale.css b/EarlyBlue/global/scale.css
index 589df2c4f9c0ea32016b868e0fbda448badfa406..8520b42d03d8e109f268633cb5ee599638970bd9 100644 (file)
--- a/EarlyBlue/global/scale.css
+++ b/EarlyBlue/global/scale.css
@@ -49,6 +49,7 @@
   background: url("chrome://global/skin/scale/scale-tray-horiz.gif") 0% 50% repeat-x;
   margin: 2px 4px;
   width: 100px;
   background: url("chrome://global/skin/scale/scale-tray-horiz.gif") 0% 50% repeat-x;
   margin: 2px 4px;
   width: 100px;

+  height: auto;

 }
 
 .scale-slider[orient="vertical"]
 }
 
 .scale-slider[orient="vertical"]

diff --git a/LCARStrek/global/media/muteButton-hover.png b/LCARStrek/global/media/muteButton-hover.png
index 3e7bf84a8ff2b24f724ee6aac25394f1403b90e0..ce4161832b81c106f15fbfbadaf0ba3a3a4da535 100644 (file)
Binary files a/LCARStrek/global/media/muteButton-hover.png and b/LCARStrek/global/media/muteButton-hover.png differ

diff --git a/LCARStrek/global/media/muteButton.png b/LCARStrek/global/media/muteButton.png
index bef18ea33db13c577c9260a0e68ffb3b46ed2e47..ffbdceaeb083ce2085dd380b94ed20c29f68714f 100644 (file)
Binary files a/LCARStrek/global/media/muteButton.png and b/LCARStrek/global/media/muteButton.png differ

diff --git a/LCARStrek/global/media/pauseButton-hover.png b/LCARStrek/global/media/pauseButton-hover.png
index 0b2db5010afd691d54fd9cad72a6eb742ae607e2..bc894e2284275cc0548dccd2232a64000f8346a4 100644 (file)
Binary files a/LCARStrek/global/media/pauseButton-hover.png and b/LCARStrek/global/media/pauseButton-hover.png differ

diff --git a/LCARStrek/global/media/pauseButton.png b/LCARStrek/global/media/pauseButton.png
index d41bd69072b3dd2333ed91ca03bdcd64d9652570..8f2d6feeb2684ae1bc9d93cfc8ee9d6e9ef89ad5 100644 (file)
Binary files a/LCARStrek/global/media/pauseButton.png and b/LCARStrek/global/media/pauseButton.png differ

diff --git a/LCARStrek/global/media/playButton-hover.png b/LCARStrek/global/media/playButton-hover.png
index 112a21467f53ec9dc758e5cbebff04a27f15408c..f31d4efd6c57349ea4642df3509f5d92e8b78fae 100644 (file)
Binary files a/LCARStrek/global/media/playButton-hover.png and b/LCARStrek/global/media/playButton-hover.png differ

diff --git a/LCARStrek/global/media/playButton.png b/LCARStrek/global/media/playButton.png
index 168e886c3fb7697834685c42a22dacefc588471a..2197f165114b012adcced9bb989f05ba9fc4351a 100644 (file)
Binary files a/LCARStrek/global/media/playButton.png and b/LCARStrek/global/media/playButton.png differ

diff --git a/LCARStrek/global/media/scrubberThumb-hover.png b/LCARStrek/global/media/scrubberThumb-hover.png
new file mode 100644 (file)
index 0000000..82c9c01
Binary files /dev/null and b/LCARStrek/global/media/scrubberThumb-hover.png differ

diff --git a/LCARStrek/global/media/scrubberThumb.png b/LCARStrek/global/media/scrubberThumb.png
new file mode 100644 (file)
index 0000000..052d7c5
Binary files /dev/null and b/LCARStrek/global/media/scrubberThumb.png differ

diff --git a/LCARStrek/global/media/unmuteButton-hover.png b/LCARStrek/global/media/unmuteButton-hover.png
index 4e0da1fad220e0ba16d7c98fa42f2d2fa2464db3..5038e27f7366abf8f1f7f7c06fd2f2b37fc9f7e7 100644 (file)
Binary files a/LCARStrek/global/media/unmuteButton-hover.png and b/LCARStrek/global/media/unmuteButton-hover.png differ

diff --git a/LCARStrek/global/media/unmuteButton.png b/LCARStrek/global/media/unmuteButton.png
index 5d5c9e0f607606cbb666f95f3186c51824d157d4..d5bb7859d07c9d01bc7c0692ea1f9ae024abbda9 100644 (file)
Binary files a/LCARStrek/global/media/unmuteButton.png and b/LCARStrek/global/media/unmuteButton.png differ

diff --git a/LCARStrek/global/media/videocontrols.css b/LCARStrek/global/media/videocontrols.css
index 678ded512064af618d2a82f28b8d98fbe55f1c72..149c0dee6a3a83ef8aa438f518b62825314307d2 100644 (file)
--- a/LCARStrek/global/media/videocontrols.css
+++ b/LCARStrek/global/media/videocontrols.css
@@ -1,7 +1,7 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 .controlBar {
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 .controlBar {

-  height: 24px;
+  height: 28px;

   background-color: rgba(156,156,255,0.75);
 }
 
   background-color: rgba(156,156,255,0.75);
 }
 


@@ -10,12 +10,17 @@
   margin: 0px;
   padding: 0px;
   border: none;
   margin: 0px;
   padding: 0px;
   border: none;

-  min-height: 24px;
-  min-width: 24px;
+  min-height: 28px;

   background-color: transparent;
   background-repeat: no-repeat;
   background-position: center center;
 }
   background-color: transparent;
   background-repeat: no-repeat;
   background-position: center center;
 }

+.playButton {
+  min-width: 28px;
+}
+.muteButton {
+  min-width: 33px;
+}

 .playButton:hover, .muteButton:hover {
   background-color: rgba(255,207,0,0.75);
 }
 .playButton:hover, .muteButton:hover {
   background-color: rgba(255,207,0,0.75);
 }


@@ -49,3 +54,57 @@
 .muteButton[muted="true"]:hover {
   background-image: url("chrome://global/skin/media/unmuteButton-hover.png");
 }
 .muteButton[muted="true"]:hover {
   background-image: url("chrome://global/skin/media/unmuteButton-hover.png");
 }

+
+.backgroundBar {
+  /* make bar 8px tall (control height = 28, minus 2 * 10 margin) */
+  margin: 10px 2px;
+  background-color: rgba(0,0,0,0.75);
+  -moz-border-radius: 3px 3px;
+}
+
+.bufferBar, .progressBar {
+  /* make bar 8px tall (control height = 28, minus 2 * 10 margin) */
+  margin: 10px 2px;
+  border: none;
+  background-color: transparent;
+  min-width: 0px;
+  min-height: 0px;
+}
+
+/* .progress-bar is an element inside the <progressmeter> implementation. */
+.bufferBar .progress-bar {
+  /*
+   * Note that this is drawn on top of the .backgroundBar. So although this
+   * has the same background-color specified, the semitransparent
+   * compositing gives it a different visual appearance.
+   */
+  background-color: rgba(255,159,0,0.75);
+  -moz-border-radius: 3px 3px;
+  -moz-appearance: none;
+}
+
+.progressBar .progress-bar {
+  background-color: #008484;
+  -moz-border-radius: 3px 3px;
+  -moz-appearance: none;
+}
+
+/* .scale-slider is an element inside the <scale> implementation. */
+.scale-slider {
+  /* Hide the default horizontal bar. */
+  background: none;
+  margin: 0 2px;
+}
+
+/* .scale-thumb is an element inside the <scale> implementation. */
+.scale-thumb {
+  /* Override the default thumb appearance with a custom image. */
+  background: url("chrome://global/skin/media/scrubberThumb.png") no-repeat center;
+  border: none !important;
+  min-width: 11px;
+  min-height: 20px;
+}
+
+.scale-thumb:hover, .scale-thumb:active {
+  background-image: url("chrome://global/skin/media/scrubberThumb-hover.png");
+}

diff --git a/LCARStrek/global/scale.css b/LCARStrek/global/scale.css
index f2a4b06d79b4221753a173f2f45536a3cfbe1fb0..f13eba11f8a5cc5ee2b31b48dee5a9ff4f973971 100644 (file)
--- a/LCARStrek/global/scale.css
+++ b/LCARStrek/global/scale.css
@@ -49,6 +49,7 @@
   background: url("chrome://global/skin/scale/scale-tray-horiz.gif") 0% 50% repeat-x;
   margin: 2px 4px;
   width: 100px;
   background: url("chrome://global/skin/scale/scale-tray-horiz.gif") 0% 50% repeat-x;
   margin: 2px 4px;
   width: 100px;

+  height: auto;

 }
 
 .scale-slider[orient="vertical"]
 }
 
 .scale-slider[orient="vertical"]