make HTML-based video controls work while keeping the XUL-based ones intact - this...
authorRobert Kaiser <kairo@kairo.at>
Mon, 23 Jan 2017 19:09:25 +0000 (20:09 +0100)
committerRobert Kaiser <kairo@kairo.at>
Mon, 23 Jan 2017 19:09:25 +0000 (20:09 +0100)
LCARStrek/global/media/closedCaptionButton.svg [new file with mode: 0644]
LCARStrek/global/media/fullscreenButton.svg [new file with mode: 0644]
LCARStrek/global/media/muteButton.svg [new file with mode: 0644]
LCARStrek/global/media/pauseButton.svg [new file with mode: 0644]
LCARStrek/global/media/playButton.svg [new file with mode: 0644]
LCARStrek/global/media/videocontrols.css

diff --git a/LCARStrek/global/media/closedCaptionButton.svg b/LCARStrek/global/media/closedCaptionButton.svg
new file mode 100644 (file)
index 0000000..d30e025
--- /dev/null
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18px" height="18px" viewBox="0 0 18 18">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #000000;
+    }
+    use[id$="-hover"] {
+      fill: #000000;
+    }
+    use[id$="-active"] {
+      fill: #000000;
+    }
+    use[id$="-focus"] {
+      fill: #000000;
+    }
+    use[id$="-disabled"] {
+      fill: #8050B0;
+    }
+  </style>
+  <symbol id="cc-off-shape">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M16.531,16.107H5.267l1.982-2H15c0.6,0,1-0.4,1-1V5.274
+      l1.946-1.964C17.963,3.399,18,3.483,18,3.576v11.031C18,15.407,17.331,16.107,16.531,16.107z M14.016,8.506h-1.218l1.005-1.014
+      C13.913,7.789,13.984,8.128,14.016,8.506z M11.786,12.361c-0.828,0-1.476-0.326-1.913-0.902l1.09-1.101
+      c0.136,0.323,0.374,0.541,0.796,0.541c0.514,0,0.695-0.44,0.756-1.014h1.535C13.908,11.43,13.071,12.361,11.786,12.361z
+       M1.496,16.106C0.697,16.104,0,15.406,0,14.607V3.576c0-0.8,0.7-1.5,1.5-1.5h12.846L16.299,0l1.316,1.283L2.615,17.13L1.496,16.106
+      z M3,4.107c-0.6,0-1,0.4-1,1v8c0,0.6,0.4,1,1,1h0.029l2.031-2.16c-0.757-0.503-1.191-1.457-1.191-2.744
+      c0-1.936,1.069-3.14,2.428-3.14c1.357,0,2.136,0.76,2.361,2.059l3.777-4.016H3z M8.298,8.506H7.355
+      c-0.047-0.623-0.49-1.23-0.99-1.23c-0.561,0-1.337,0.84-1.337,1.995c0,0.674,0.381,1.427,0.95,1.702L8.298,8.506z"/>
+  </symbol>
+
+  <symbol id="cc-shape">
+    <path d="M16.531,1.984H1.5c-0.8,0-1.5,0.7-1.5,1.5v11.031c0,0.8,0.7,1.5,1.5,1.5h15.031
+      c0.8,0,1.469-0.7,1.469-1.5V3.484C18,2.684,17.331,1.984,16.531,1.984z M16,13.016c0,0.6-0.4,1-1,1H3c-0.6,0-1-0.4-1-1v-8
+      c0-0.6,0.4-1,1-1h12c0.6,0,1,0.4,1,1V13.016z M6.426,10.807c-0.811,0-0.96-0.789-0.96-1.628c0-1.155,0.338-1.745,0.899-1.745
+      c0.5,0,0.818,0.357,0.866,0.98h1.484C8.585,6.877,7.785,5.972,6.297,5.972c-1.359,0-2.428,1.205-2.428,3.14
+      c0,1.944,0.974,3.157,2.583,3.157c1.285,0,2.153-0.93,2.295-2.476H7.244C7.183,10.367,6.94,10.807,6.426,10.807z M11.759,10.807
+      c-0.811,0-0.96-0.789-0.96-1.628c0-1.155,0.338-1.745,0.899-1.745c0.5,0,0.756,0.357,0.803,0.98h1.515
+      c-0.129-1.537-0.898-2.443-2.385-2.443c-1.359,0-2.396,1.205-2.396,3.14c0,1.944,0.943,3.157,2.552,3.157
+      c1.285,0,2.122-0.93,2.264-2.476h-1.535C12.454,10.367,12.273,10.807,11.759,10.807z"/>
+  </symbol>
+  <use id="cc" xlink:href="#cc-shape"/>
+  <use id="cc-hover" xlink:href="#cc-shape"/>
+  <use id="cc-active" xlink:href="#cc-shape"/>
+  <use id="cc-focus" xlink:href="#cc-shape"/>
+  <use id="cc-disabled" xlink:href="#cc-shape"/>
+
+  <use id="cc-off" xlink:href="#cc-off-shape"/>
+  <use id="cc-off-hover" xlink:href="#cc-off-shape"/>
+  <use id="cc-off-active" xlink:href="#cc-off-shape"/>
+  <use id="cc-off-focus" xlink:href="#cc-off-shape"/>
+  <use id="cc-off-disabled" xlink:href="#cc-off-shape"/>
+</svg>
diff --git a/LCARStrek/global/media/fullscreenButton.svg b/LCARStrek/global/media/fullscreenButton.svg
new file mode 100644 (file)
index 0000000..b70483a
--- /dev/null
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18px" height="18px" viewBox="0 0 18 18">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #000000;
+    }
+    use[id$="-hover"] {
+      fill: #000000;
+    }
+    use[id$="-active"] {
+      fill: #000000;
+    }
+    use[id$="-focus"] {
+      fill: #000000;
+    }
+    use[id$="-disabled"] {
+      fill: #8050B0;
+    }
+  </style>
+  <symbol id="fullscreen-shape">
+    <path d="M6.728,10.188l-3.235,3.094l0.017-2.267l-1.513-0.016l0,5l4.987-0.008l0.011-1.537l-2.281-0.022
+  l3.097-3.158L6.728,10.188z M14.453,11.004l-0.022,2.281l-3.158-3.097l-1.086,1.083l3.094,3.235l-2.267-0.017l-0.016,1.514l5,0
+  l-0.008-4.988L14.453,11.004z M11.015,2.01l-0.011,1.537l2.281,0.022l-3.097,3.158l1.083,1.086l3.235-3.094L14.49,6.986
+  l1.513,0.016v-5L11.015,2.01z M6.986,3.511l0.016-1.514l-5,0L2.01,6.985l1.537,0.011l0.022-2.281l3.158,3.097l1.086-1.083
+  L4.718,3.494L6.986,3.511z"/>
+  </symbol>
+  <symbol id="unfullscreen-shape">
+    <path d="M2.047,11.135l-0.011,1.537l2.281,0.022L1.22,15.851l1.083,1.086l3.235-3.094l-0.017,2.268l1.513,0.016
+  l0-5L2.047,11.135z M13.781,12.587l2.267,0.017l0.016-1.514l-5,0l0.008,4.988l1.537,0.011l0.022-2.281l3.158,3.097l1.086-1.083
+  L13.781,12.587z M16.058,5.578l-2.281-0.021l3.097-3.158l-1.083-1.086l-3.235,3.094l0.017-2.267L11.06,2.123v5l4.988-0.008
+  L16.058,5.578z M5.516,2.098L5.494,4.379L2.336,1.283L1.25,2.365L4.344,5.6L2.077,5.583L2.06,7.097l5,0L7.053,2.109L5.516,2.098z"/>
+  </symbol>
+  <use id="fullscreen" xlink:href="#fullscreen-shape"/>
+  <use id="fullscreen-hover" xlink:href="#fullscreen-shape"/>
+  <use id="fullscreen-active" xlink:href="#fullscreen-shape"/>
+  <use id="fullscreen-focus" xlink:href="#fullscreen-shape"/>
+  <use id="fullscreen-disabled" xlink:href="#fullscreen-shape"/>
+
+  <use id="unfullscreen" xlink:href="#unfullscreen-shape"/>
+  <use id="unfullscreen-hover" xlink:href="#unfullscreen-shape"/>
+  <use id="unfullscreen-active" xlink:href="#unfullscreen-shape"/>
+  <use id="unfullscreen-focus" xlink:href="#unfullscreen-shape"/>
+  <use id="unfullscreen-disabled" xlink:href="#unfullscreen-shape"/>
+</svg>
diff --git a/LCARStrek/global/media/muteButton.svg b/LCARStrek/global/media/muteButton.svg
new file mode 100644 (file)
index 0000000..943716b
--- /dev/null
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18px" height="18px" viewBox="0 0 18 18">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #000000;
+    }
+    use[id$="-hover"] {
+      fill: #000000;
+    }
+    use[id$="-active"] {
+      fill: #000000;
+    }
+    use[id$="-focus"] {
+      fill: #000000;
+    }
+    use[id$="-disabled"] {
+      fill: #8050B0;
+    }
+  </style>
+  <symbol id="unmute-shape">
+    <path d="M3.52,5.367c-1.332,0-2.422,1.09-2.422,2.422v2.422c0,1.332,1.09,2.422,2.422,2.422h1.516l4.102,3.633
+    V1.735L5.035,5.367H3.52z M12.059,9c0-0.727-0.484-1.211-1.211-1.211v2.422C11.574,10.211,12.059,9.727,12.059,9z M14.48,9
+    c0-1.695-1.211-3.148-2.785-3.512l-0.363,1.09C12.422,6.82,13.27,7.789,13.27,9c0,1.211-0.848,2.18-1.938,2.422l0.484,1.09
+    C13.27,12.148,14.48,10.695,14.48,9z M12.543,3.188l-0.484,1.09C14.238,4.883,15.691,6.82,15.691,9c0,2.18-1.453,4.117-3.512,4.601
+    l0.484,1.09c2.422-0.605,4.238-2.906,4.238-5.691C16.902,6.215,15.086,3.914,12.543,3.188z"/>
+  </symbol>
+  <symbol id="mute-shape">
+    <path d="M3.52,5.367c-1.332,0-2.422,1.09-2.422,2.422v2.422c0,1.332,1.09,2.422,2.422,2.422h1.516l4.102,3.633
+      V1.735L5.035,5.367H3.52z"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M12.155,12.066l-1.138-1.138l4.872-4.872l1.138,1.138
+      L12.155,12.066z"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M10.998,7.204l1.138-1.138l4.872,4.872l-1.138,1.138L10.998,7.204
+               z"/>
+  </symbol>
+  <symbol id="noaudio-shape">
+         <path d="M14.901,3.571l-4.412,3.422V1.919L6.286,5.46H4.869c-1.298,0-2.36,1.062-2.36,2.36v2.36
+               c0,1.062,0.708,1.888,1.652,2.242l-2.242,1.77l1.18,1.416L16.081,4.987L14.901,3.571z M10.489,16.081V11.36l-2.669,2.36
+               L10.489,16.081z"/>
+  </symbol>
+  <use id="unmute" xlink:href="#unmute-shape"/>
+  <use id="unmute-hover" xlink:href="#unmute-shape"/>
+  <use id="unmute-active" xlink:href="#unmute-shape"/>
+  <use id="unmute-focus" xlink:href="#unmute-shape"/>
+  <use id="unmute-disabled" xlink:href="#unmute-shape"/>
+
+  <use id="mute" xlink:href="#mute-shape"/>
+  <use id="mute-hover" xlink:href="#mute-shape"/>
+  <use id="mute-active" xlink:href="#mute-shape"/>
+  <use id="mute-focus" xlink:href="#mute-shape"/>
+  <use id="mute-disabled" xlink:href="#mute-shape"/>
+
+  <use id="noaudio" xlink:href="#noaudio-shape"/>
+</svg>
diff --git a/LCARStrek/global/media/pauseButton.svg b/LCARStrek/global/media/pauseButton.svg
new file mode 100644 (file)
index 0000000..d3155d9
--- /dev/null
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18px" height="18px" viewBox="0 0 18 18">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #000000;
+    }
+    use[id$="-hover"] {
+      fill: #000000;
+    }
+    use[id$="-active"] {
+      fill: #000000;
+    }
+    use[id$="-focus"] {
+      fill: #000000;
+    }
+    use[id$="-disabled"] {
+      fill: #8050B0;
+    }
+  </style>
+
+
+  <symbol id="pause-shape">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M6.002,1.953C5.172,1.953,4.5,2.626,4.5,3.455v11.08
+        c0,0.83,0.672,1.502,1.502,1.502c0.829,0,1.502-0.672,1.502-1.502V3.455C7.504,2.626,6.831,1.953,6.002,1.953z M12,1.953
+        c-0.828,0-1.5,0.672-1.5,1.5v11.094c0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5V3.453C13.5,2.625,12.828,1.953,12,1.953z"/>
+  </symbol>
+
+  <use id="pause" xlink:href="#pause-shape"/>
+  <use id="pause-hover" xlink:href="#pause-shape"/>
+  <use id="pause-active" xlink:href="#pause-shape"/>
+  <use id="pause-focus" xlink:href="#pause-shape"/>
+  <use id="pause-disalbed" xlink:href="#pause-shape"/>
+</svg>
diff --git a/LCARStrek/global/media/playButton.svg b/LCARStrek/global/media/playButton.svg
new file mode 100644 (file)
index 0000000..40afb5a
--- /dev/null
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18px" height="18px" viewBox="0 0 18 18">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #000000;
+    }
+    use[id$="-hover"] {
+      fill: #000000;
+    }
+    use[id$="-active"] {
+      fill: #000000;
+    }
+    use[id$="-focus"] {
+      fill: #000000;
+    }
+    use[id$="-disabled"] {
+      fill: #8050B0;
+    }
+    use[id$="-clicktoplay"] {
+      fill: #FFCF00;
+    }
+  </style>
+
+  <symbol id="play-shape">
+    <path d="M3.243,15.155c0,0.845,0.593,1.157,1.317,0.707l9.659-6.041c0.727-0.453,0.722-1.193,0-1.645L4.556,2.137
+    C3.827,1.682,3.237,2.014,3.237,2.844v12.312H3.243z"/>
+  </symbol>
+
+  <use id="play" xlink:href="#play-shape"/>
+  <use id="play-hover" xlink:href="#play-shape"/>
+  <use id="play-active" xlink:href="#play-shape"/>
+  <use id="play-focus" xlink:href="#play-shape"/>
+  <use id="play-clicktoplay" xlink:href="#play-shape"/>
+</svg>
index a950832d07f682e778f29ad3a16b3139dc176aff..8841713c2890196d818b7732f0269a8995230f93 100644 (file)
@@ -2,18 +2,19 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+/*@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");*/
+@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
 
-.controlBar {
+hbox.controlBar {
   height: 28px;
   background-color: rgba(156,156,255,0.75);
 }
 
-.playButton,
-.muteButton,
-.closedCaptionButton,
-.fullscreenButton {
+xul|button.playButton,
+xul|button.muteButton,
+xul|button.closedCaptionButton,
+xul|button.fullscreenButton {
   background-color: transparent;
   background-repeat: no-repeat;
   background-position: center;
   border: none;
 }
 
-.playButton:hover,
-.muteButton:not([noAudio]):hover,
-.closedCaptionButton:hover,
-.fullscreenButton:hover {
+xul|button.playButton:hover,
+xul|button.muteButton:not([noAudio]):hover,
+xul|button.closedCaptionButton:hover,
+xul|button.fullscreenButton:hover {
   background-color: rgba(255,207,0,0.75);
 }
 
-.playButton:hover:active,
-.muteButton:not([noAudio]):hover:active,
-.closedCaptionButton:hover:active,
-.fullscreenButton:hover:active {
+xul|button.playButton:hover:active,
+xul|button.muteButton:not([noAudio]):hover:active,
+xul|button.closedCaptionButton:hover:active,
+xul|button.fullscreenButton:hover:active {
   background-color: rgba(255,159,0,0.75);
 }
 
-.playButton {
+xul|button.playButton {
   background-image: url("chrome://global/skin/media/pauseButton.png");
   margin-right: -22px; /* 1/2 of scrubber thumb width, for overhang. */
   position: relative; /* Trick to work around negative margin interfering with clicking on the button. */
 }
 
-.playButton:hover {
+xul|button.playButton:hover {
   background-image: url("chrome://global/skin/media/pauseButton-hover.png");
 }
 
-.playButton[paused] {
+xul|button.playButton[paused] {
   background-image: url("chrome://global/skin/media/playButton.png");
 }
 
-.playButton[paused]:hover {
+xul|button.playButton[paused]:hover {
   background-image: url("chrome://global/skin/media/playButton-hover.png");
 }
 
-.muteButton {
+xul|button.muteButton {
   background-image: url("chrome://global/skin/media/muteButton.png");
   min-width: 33px;
 }
 
-.muteButton:hover {
+xul|button.muteButton:hover {
   background-image: url("chrome://global/skin/media/muteButton-hover.png");
 }
 
-.muteButton[muted] {
+xul|button.muteButton[muted] {
   background-image: url("chrome://global/skin/media/unmuteButton.png");
 }
 
-.muteButton[muted]:hover {
+xul|button.muteButton[muted]:hover {
   background-image: url("chrome://global/skin/media/unmuteButton-hover.png");
 }
 
-.muteButton[noAudio] {
+xul|button.muteButton[noAudio] {
   background-image: url("chrome://global/skin/media/noAudio.png");
 }
 
-.muteButton[noAudio] + .volumeStack {
+xul|button.muteButton[noAudio] + .volumeStack {
   display: none;
 }
 
-.closedCaptionButton {
+xul|button.closedCaptionButton {
   background-image: url("chrome://global/skin/media/closeCaptionButton.png");
   background-position: 4px;
 }
 
-.closedCaptionButton:hover {
+xul|button.closedCaptionButton:hover {
   background-image: url("chrome://global/skin/media/closeCaptionButton-hover.png");
 }
 
-.closedCaptionButton[enabled] {
+xul|button.closedCaptionButton[enabled] {
   opacity: 1;
 }
 
-.closedCaptionButton[hidden] {
+xul|button.closedCaptionButton[hidden] {
   display: none;
 }
 
-.fullscreenButton {
+xul|button.fullscreenButton {
   background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 16, 16, 0);
 }
 
-.fullscreenButton:hover {
+xul|button.fullscreenButton:hover {
   background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton-hover.png"), 0, 16, 16, 0);
 }
 
-.fullscreenButton[fullscreened] {
+xul|button.fullscreenButton[fullscreened] {
   background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 32, 16, 16);
 }
 
-.fullscreenButton[fullscreened]:hover {
+xul|button.fullscreenButton[fullscreened]:hover {
   background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton-hover.png"), 0, 32, 16, 16);
 }
 
-.volumeControl {
+xul|*.volumeControl {
   width: 32px;
   opacity: 0;
 }
 
-.volumeBackground,
-.volumeForeground {
+xul|*.volumeBackground,
+xul|*.volumeForeground {
   background-repeat: no-repeat;
   background-position: center;
   width: 32px;
 }
 
-.volumeBackground {
+xul|*.volumeBackground {
   background-image: url("chrome://global/skin/media/volume-empty.png");
 }
 
-.volumeForeground {
+xul|*.volumeForeground {
   background-image: url("chrome://global/skin/media/volume-full.png");
   background-clip: content-box;
 }
 
-.textTrackList {
+xul|*.textTrackList {
   display: -moz-box;
   -moz-appearance: none;
   -moz-box-pack: end;
   padding: 0;
 }
 
-.textTrackList[hidden] {
+xul|*.textTrackList[hidden] {
   display: none;
 }
 
-.textTrackList > html|*.textTrackItem {
+xul|*.textTrackList > html|*.textTrackItem {
   -moz-appearance: none;
   -moz-box-align: start;
   text-align: start;
   white-space: nowrap;
 }
 
-.textTrackList > html|*.textTrackItem[on] {
+xul|*.textTrackList > html|*.textTrackItem[on] {
   color: white;
   background-color: black;
 }
 
-.textTrackList > html|*.textTrackItem:hover {
+xul|*.textTrackList > html|*.textTrackItem:hover {
   background-color: rgba(0,0,0,.55);
 }
 
-.controlBar[fullscreen-unavailable] {
+xul|*.controlBar[fullscreen-unavailable] {
   /* This value is duplicated in the videocontrols.xml adjustControlSize function. */
   padding-inline-end: 8px;
 }
 
-.volumeControl .scale-thumb {
+xul|*.volumeControl .scale-thumb {
   min-width: 0;
   opacity: 0;
 }
 
-.durationBox {
+xul|*.durationBox {
   -moz-box-pack: center;
 }
 
-.durationLabel {
+xul|*.durationLabel {
   margin-left: -22px; /* 1/2 of scrubber thumb width, for overhang. */
   padding-left: 8px; /* don't bump into the scrubber bar */
   padding-top: 0px; /* center vertically with scrubber bar */
   font-size: 11px;
 }
 
-.positionLabel {
+xul|*.positionLabel {
   display: none;
 }
 
-.backgroundBar {
+xul|*.backgroundBar {
   /* margin top/bottom: make bar 8px tall (control height = 28, minus 2 * 10 margin) */
   /* margin left/right: 1/2 of scrubber thumb width, for overhang. */
   margin: 10px 22px;
   border-radius: 2.5px;
 }
 
-.bufferBar,
-.progressBar {
+xul|*.bufferBar,
+xul|*.progressBar {
   /* margin top/bottom: make bar 8px tall (control height = 28, minus 2 * 10 margin) */
   /* margin left/right: 1/2 of scrubber thumb width, for overhang. */
   margin: 10px 22px;
 }
 
 /* .progress-bar is an element inside the <progressmeter> implementation. */
-.bufferBar .progress-bar {
+xul|*.bufferBar .progress-bar {
   /*
    * Note that this is drawn on top of the .backgroundBar. So although this
    * has the same background-color specified, the semitransparent
   -moz-appearance: none;
 }
 
-.progressBar .progress-bar {
+xul|*.progressBar .progress-bar {
   background-color: #008484;
   border-radius: 2.5px;
   -moz-appearance: none;
 }
 
 /* .scale-slider is an element inside the <scale> implementation. */
-.scrubber .scale-slider,
-.volumeControl .scale-slider {
+xul|*.scrubber .scale-slider,
+xul|*.volumeControl .scale-slider {
   /* Hide the default horizontal bar. */
   background: none;
   margin: 0;
 }
 
-.scrubber .scale-slider {
+xul|*.scrubber .scale-slider {
   /* abs(margin-top) + margin-bottom + bar height == timeThumb height */
   margin-top: -10px;
   margin-bottom: 10px;
 }
 
 /* .scale-thumb is an element inside the <scale> implementation. */
-.scrubber .scale-thumb,
-.volumeControl .scale-thumb {
+xul|*.scrubber .scale-thumb,
+xul|*.volumeControl .scale-thumb {
   /* Override the default thumb appearance with a custom image. */
   background: transparent;
   border: none !important;
 }
 
-.timeThumb {
+xul|*.timeThumb {
   background: url("chrome://global/skin/media/scrubberThumb.png") no-repeat center;
   min-width: 45px;
   min-height: 28px;
   -moz-box-pack: center;
 }
 
-.timeThumb[showhours="true"] {
+xul|*.timeThumb[showhours="true"] {
   background-image: url("chrome://global/skin/media/scrubberThumbWide.png");
 }
 
 }
 */
 
-.timeLabel {
+xul|*.timeLabel {
   color: rgba(0,0,0,0.75);
   font-size: 10px;
   font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
   padding-top: 5px;
 }
 
-.statusOverlay {
+xul|*.statusOverlay {
   -moz-box-align: center;
   -moz-box-pack: center;
   background-color: rgba(0,0,0,0.55);
 }
 
-.statusIcon {
+xul|*.statusIcon {
   margin-bottom: 28px; /* same height as .controlBar, to keep icon centered above it */
   width: 36px;
   height: 36px;
 }
 
-.statusIcon[type="throbber"] {
+xul|*.statusIcon[type="throbber"] {
   background: url("chrome://communicator/skin/brand/throbber-anim.png") no-repeat center;
 }
 /*
   background: url("chrome://global/skin/media/stalled.png") no-repeat center;
 }
 */
-.statusIcon[type="error"] {
+xul|*.statusIcon[type="error"] {
   background: url("chrome://global/skin/icons/alert-error.gif") no-repeat center;
 }
 
@@ -478,3 +479,490 @@ html|table {
     background-size: 45px 28px;
   }
 }
+
+
+/***** New HTML-based controls *****/
+
+/*@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace url("http://www.w3.org/1999/xhtml");*/
+
+video > xul|videocontrols,
+audio > xul|videocontrols {
+  writing-mode: horizontal-tb;
+  width: 100%;
+  height: 100%;
+/*  display: inline-block;  --->CRASHES XUL-based versions! */
+  -moz-box-pack: end;
+}
+
+div.controlsContainer [hidden="true"],
+div.controlBar[hidden] {
+  display: none;
+}
+
+div.controlBar[size="hidden"] {
+  display: none;
+}
+
+div.controlsContainer,
+div.progressContainer {
+  position: relative;
+  height: 100%;
+}
+
+div.stackItem {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  height: 100%;
+}
+
+div.statusOverlay {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  background-color: rgb(160,144,144);
+}
+
+div.controlsOverlay {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  position: relative;
+}
+
+div.controlsSpacerStack {
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+  justify-content: center;
+  align-items: center;
+}
+
+div.controlsSpacer {
+  background-color: rgba(0,0,0,.4);
+}
+
+div.controlBar {
+  position: relative;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+  height: 40px;
+  padding: 0 3px;
+  background-color: rgba(156,156,255,0.75);
+}
+
+
+html|button.playButton,
+html|button.muteButton,
+html|button.closedCaptionButton,
+html|button.fullscreenButton {
+  height: 100%;
+  min-height: 30px;
+  min-width: 30px;
+  padding: 0;
+  border: 0;
+  margin: 0;
+  background-color: transparent;
+  background-repeat: no-repeat;
+  background-position: center;
+  background-origin: content-box;
+  background-clip: content-box;
+}
+
+html|button.playButton:hover,
+html|button.muteButton:not([noAudio]):hover,
+html|button.closedCaptionButton:hover,
+html|button.fullscreenButton:hover {
+  background-color: rgba(255,207,0,0.75);
+}
+
+html|button.playButton:hover:active,
+html|button.muteButton:not([noAudio]):hover:active,
+html|button.closedCaptionButton:hover:active,
+html|button.fullscreenButton:hover:active {
+  background-color: rgba(255,159,0,0.75);
+}
+
+html|button.playButton {
+  background-image: url(chrome://global/skin/media/pauseButton.svg#pause);
+}
+.playButton:hover {
+html|butto  background-image: url(chrome://global/skin/media/pauseButton.svg#pause-hover);
+}
+html|button.playButton:hover:active {
+  background-image: url(chrome://global/skin/media/pauseButton.svg#pause-active);
+}
+html|button.playButton[paused] {
+  background-image: url(chrome://global/skin/media/playButton.svg#play);
+}
+html|button.playButton[paused]:hover {
+  background-image: url(chrome://global/skin/media/playButton.svg#play-hover);
+}
+html|button.playButton[paused]:hover:active {
+  background-image: url(chrome://global/skin/media/playButton.svg#play-active);
+}
+
+html|button.muteButton {
+  background-image: url(chrome://global/skin/media/muteButton.svg#unmute);
+}
+html|button.muteButton:hover {
+  background-image: url(chrome://global/skin/media/muteButton.svg#unmute-hover);
+}
+html|button.muteButton:hover:active {
+  background-image: url(chrome://global/skin/media/muteButton.svg#unmute-active);
+}
+html|button.muteButton[muted] {
+  background-image: url(chrome://global/skin/media/muteButton.svg#mute);
+}
+html|button.muteButton[muted]:hover {
+  background-image: url(chrome://global/skin/media/muteButton.svg#mute-hover);
+}
+html|button.muteButton[muted]:hover:active {
+  background-image: url(chrome://global/skin/media/muteButton.svg#mute-active);
+}
+html|button.muteButton[noAudio],
+html|button.muteButton[noAudio]:hover,
+html|button.muteButton[noAudio]:hover:active {
+  background-image: url(chrome://global/skin/media/muteButton.svg#noaudio);
+}
+html|button.muteButton[noAudio] + .volumeStack {
+  display: none;
+}
+
+html|button.closedCaptionButton {
+  background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-off);
+}
+html|button.closedCaptionButton:hover {
+  background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-off-hover);
+}
+html|button.closedCaptionButton:hover:active {
+  background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-off-active);
+}
+html|button.closedCaptionButton[enabled] {
+  background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc);
+}
+html|button.closedCaptionButton[enabled]:hover {
+  background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-hover);
+}
+html|button.closedCaptionButton[enabled]:hover:active {
+  background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-active);
+}
+
+html|button.fullscreenButton {
+  background-image: url(chrome://global/skin/media/fullscreenButton.svg#fullscreen);
+}
+html|button.fullscreenButton:hover {
+  background-image: url(chrome://global/skin/media/fullscreenButton.svg#fullscreen-hover);
+}
+html|button.fullscreenButton:hover:active {
+  background-image: url(chrome://global/skin/media/fullscreenButton.svg#fullscreen-active);
+}
+html|button.fullscreenButton[fullscreened] {
+  background-image: url(chrome://global/skin/media/fullscreenButton.svg#unfullscreen);
+}
+html|button.fullscreenButton[fullscreened]:hover {
+  background-image: url(chrome://global/skin/media/fullscreenButton.svg#unfullscreen-hover);
+}
+html|button.fullscreenButton[fullscreened]:hover:active {
+  background-image: url(chrome://global/skin/media/fullscreenButton.svg#unfullscreen-active);
+}
+
+div.controlBarSpacer {
+  flex-grow: 1;
+}
+
+input.volumeControl::-moz-range-thumb,
+input.scrubber::-moz-range-thumb {
+  height: 13px;
+  width: 13px;
+  border: none;
+  border-radius: 50%;
+  background-color: #000000;
+}
+
+input.volumeControl::-moz-focus-outer,
+input.scrubber::-moz-focus-outer {
+  border: 0;
+}
+
+div.progressBackgroundBar {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+
+div.progressStack {
+  position: relative;
+  width: 100%;
+  height: 5px;
+}
+
+div.scrubberStack {
+  min-width: 48px;
+  flex-basis: 48px;
+  flex-grow: 2;
+  flex-shrink: 0;
+  margin: 0 9px;
+}
+
+div.volumeStack {
+  max-width: 60px;
+  min-width: 48px;
+  flex-grow: 1;
+  flex-shrink: 0;
+  margin-right: 6px;
+  margin-left: 4px;
+}
+
+progress.bufferBar,
+progress.progressBar,
+input.scrubber,
+.volumeBackground,
+input.volumeControl {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  padding: 0;
+  border: 0;
+  border-radius: 2.5px;
+  margin: 0;
+  background: none;
+  background-color: transparent;
+}
+
+progress.bufferBar,
+.volumeBackground {
+  background-color: rgba(160,144,144,0.7);
+}
+
+progress.bufferBar::-moz-progress-bar,
+progress.progressBar::-moz-progress-bar,
+.volumeBackground::-moz-meter-bar {
+  height: 100%;
+  padding: 0;
+  margin: 0;
+  border: 0;
+  border-radius: 2.5px;
+  background: none;
+}
+
+input.scrubber:hover::-moz-range-thumb,
+input.volumeControl:hover::-moz-range-thumb {
+  background-color: #FFCF00;
+}
+
+input.scrubber:active::-moz-range-thumb,
+input.volumeControl:active::-moz-range-thumb {
+  background-color: #FF9F00;
+}
+
+input.scrubber::-moz-range-track,
+input.scrubber::-moz-range-progress {
+  background-color: transparent;
+}
+
+input.volumeControl::-moz-range-progress,
+input.volumeControl::-moz-range-track {
+  height: 5px;
+  border-radius: 2.5px;
+}
+
+input.volumeControl::-moz-range-progress {
+  background-color: #008484;
+}
+
+input.volumeControl::-moz-range-track {
+  background-color: rgba(0,0,0,0.7);
+}
+
+
+progress.bufferBar::-moz-progress-bar {
+  background-color: rgba(160,144,144,0.3);
+  border-radius: 2.5px;
+}
+
+progress.progressBar::-moz-progress-bar {
+  background-color: #008484;
+}
+
+.textTrackList {
+  position: absolute;
+  right: 5px;
+  bottom: 45px;
+  max-width: 80%;
+  border: 1px solid #000000;
+  border-radius: 2.5px;
+  padding: 5px 0;
+  vertical-align: middle;
+  font-size: 12px;
+  background-color: #000000;
+  opacity: 0.7;
+}
+
+.textTrackList > .textTrackItem {
+  display: block;
+  width: 100%;
+  height: 30px;
+  padding: 2px 10px;
+  border: none;
+  margin: 0;
+  white-space: nowrap;
+  overflow: hidden;
+  text-align: left;
+  text-overflow: ellipsis;
+  color: #FFCF00;
+  background-color: transparent;
+}
+
+.textTrackList > .textTrackItem:hover {
+  background-color: #FFCF00;
+}
+
+.textTrackList > .textTrackItem[on] {
+  color: #008484;
+}
+
+span.positionLabel,
+span.durationLabel {
+  display: none;
+}
+
+span.positionDurationBox {
+  min-width: 9ch;
+  text-align: center;
+  padding-inline-start: 1px;
+  padding-inline-end: 9px;
+  white-space: nowrap;
+  font: message-box;
+  font-size: 13px;
+  font-size-adjust: 0.6;
+  color: #000000;
+}
+
+span.positionDurationBox[positionOnly] {
+  min-width: 4ch;
+}
+
+span.duration {
+  display: inline-block;
+  white-space: pre;
+  color: #8050B0;
+}
+
+.statusIcon {
+  width: 36px;
+  height: 36px;
+  margin-bottom: 20px;
+}
+
+.statusIcon[type="throbber"] {
+  background: url("chrome://communicator/skin/brand/throbber-anim.png") no-repeat center;
+}
+/*
+.statusIcon[type="throbber"][stalled] {
+  background: url("chrome://global/skin/media/stalled.png") no-repeat center;
+}
+*/
+.statusIcon[type="error"] {
+  min-width: 70px;
+  min-height: 60px;
+  background: url("chrome://global/skin/icons/alert-error.gif") no-repeat center;
+  background-size: contain;
+}
+
+/* Overlay Play button */
+.clickToPlay {
+  min-width: 48px;
+  min-height: 48px;
+  border-radius: 50%;
+  background-image: url(chrome://global/skin/media/playButton.svg#play);
+  background-repeat: no-repeat;
+  background-position: 54% 50%;
+  background-size: 40% 40%;
+  background-color: #000000;
+  opacity: 0.8;
+  position: relative;
+  top: 20px;
+}
+
+.controlsSpacerStack:hover > .clickToPlay,
+.clickToPlay:hover {
+  opacity: 0.55;
+}
+
+.controlsSpacerStack:hover > .clickToPlay[fadeout] {
+  opacity: 0;
+}
+
+.controlBar[fullscreen-unavailable] .fullscreenButton {
+  display: none;
+}
+
+/* CSS Transitions */
+.clickToPlay {
+  transition-property: transform, opacity;
+  transition-duration: 400ms, 400ms;
+}
+
+.controlsSpacer[fadeout] {
+  opacity: 0;
+}
+
+.clickToPlay[fadeout] {
+  transform: scale(3);
+  opacity: 0;
+}
+
+.clickToPlay[fadeout][immediate] {
+  transition-property: opacity, background-size;
+  transition-duration: 0s, 0s;
+}
+.controlBar:not([immediate]) {
+  transition-property: opacity;
+  transition-duration: 200ms;
+}
+.controlBar[fadeout] {
+  opacity: 0;
+}
+.volumeStack:not([immediate]) {
+  transition-property: opacity, margin-top;
+  transition-duration: 200ms, 200ms;
+}
+.statusOverlay:not([immediate]) {
+  transition-property: opacity;
+  transition-duration: 300ms;
+  transition-delay: 750ms;
+}
+.statusOverlay[fadeout] {
+  opacity: 0;
+}
+
+/* Error description formatting */
+.errorLabel {
+  padding: 0 10px;
+  text-align: center;
+  font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
+  font-size: 14px;
+  color: #E7ADE7;
+}
+
+.errorLabel {
+  display: none;
+}
+
+[error="errorAborted"]         > [anonid="errorAborted"],
+[error="errorNetwork"]         > [anonid="errorNetwork"],
+[error="errorDecode"]          > [anonid="errorDecode"],
+[error="errorSrcNotSupported"] > [anonid="errorSrcNotSupported"],
+[error="errorNoSource"]        > [anonid="errorNoSource"],
+[error="errorGeneric"]         > [anonid="errorGeneric"] {
+  display: inline;
+}