elbaitemoon

commit bbf4367a90b49c1c12398c5bc7009f7759d8693d
parent 532ebf2a30fce22d1f9213ac878f5fc3efe521ab
Author: Lootyhoof <lootyhoofer@gmail.com>
Date:   Mon, 27 Jun 2016 20:44:42 +0100

Refactor media controls for v26.3

Diffstat:
M
src/chrome/global/media/videocontrols.css
 | 
57
+++++++++++++++++++++++++++++++--------------------------

1 file changed, 31 insertions(+), 26 deletions(-)
diff --git a/src/chrome/global/media/videocontrols.css b/src/chrome/global/media/videocontrols.css
@@ -59,6 +59,10 @@
   background-image: url(chrome://global/skin/media/noAudio.png);
 }
 
+.muteButton[noAudio] + .volumeStack {
+  display: none;
+}
+
 .fullscreenButton {
   background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 16, 16, 0);
 }
@@ -67,36 +71,35 @@
   background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 32, 16, 16);
 }
 
-.volumeStack {
-  width: 28px;
-  height: 70px;
-  background-color: rgba(35,31,32,.74);
-  /* use negative margin to place stack over the mute button to its left. */
-  margin: -70px 3px 28px -31px;
-  overflow: hidden; /* crop it when sliding down, don't grow the control bar */
-  position: relative; /* Trick to work around negative margin interfering with dragging the thumb. */
-  padding-top: 6px;
+.volumeControl {
+  width: 32px;
+  opacity: 0;
 }
 
-.volumeControl {
-  min-height: 64px;
+.volumeBackground,
+.volumeForeground {
+  background-repeat: no-repeat;
+  background-position: center;
+  width: 32px;
 }
 
-/* .scale-thumb is an element inside the <scale> implementation. */
-.volumeControl .scale-thumb {
-  /* Override the default thumb appearance with a custom image. */
-  -moz-appearance: none;
-  background: url(chrome://global/skin/media/volumeThumb.png) no-repeat center;
-  border: none;
-  min-width: 20px;
-  min-height: 10px;
+.volumeBackground {
+  background-image: url(chrome://global/skin/media/volume-empty.png);
 }
 
-.volumeBackgroundBar {
-  /* margin left/right: make bar 8px wide (control width = 28, minus 2 * 10 margin) */
-  margin: 0 10px;
-  background-color: rgba(255,255,255,.75);
-  border-radius: 2.5px;
+.volumeForeground {
+  background-image: url(chrome://global/skin/media/volume-full.png);
+  background-clip: content-box;
+}
+
+.controlBar[audio-only] > .volumeStack {
+  /* This value is duplicated in the videocontrols.xml adjustControlSize function. */
+  -moz-margin-end: 8px;
+}
+
+.volumeControl .scale-thumb {
+  min-width: 0;
+  opacity: 0;
 }
 
 .durationBox {
@@ -170,7 +173,8 @@
 }
 
 /* .scale-thumb is an element inside the <scale> implementation. */
-.scrubber .scale-thumb {
+.scrubber .scale-thumb,
+.volumeControl .scale-thumb {
   /* Override the default thumb appearance with a custom image. */
   -moz-appearance: none;
   background: transparent;
@@ -312,4 +316,4 @@ html|table {
     1px 1px 0 #000;
   padding: 0 10px;
   text-align: center;
-}
+}
+\ No newline at end of file