Commit 45f5a37a authored by Raine Makelainen's avatar Raine Makelainen

Merge remote-tracking branch 'origin/master' into nemo_embedlite_38

parents 16ce7da9 2dd22eb3
......@@ -13,6 +13,12 @@
-moz-box-orient: horizontal;
}
.controlsOverlay[scaled] {
/* scaled attribute in videocontrols.css causes conflict
due to different -moz-box-orient values */
-moz-box-align: end;
}
.controlBar {
-moz-box-flex: 1;
font-size: 16pt;
......@@ -21,11 +27,6 @@
width: 100%;
}
.controlsSpacer {
display: none;
-moz-box-flex: 0;
}
.buttonsBar {
padding: 0px;
margin-top: 0px;
......@@ -34,9 +35,15 @@
margin-right: 20px;
}
.fullscreenButton,
.controlsSpacer {
display: none;
-moz-box-flex: 0;
}
.playButton,
.muteButton {
.castingButton,
.muteButton,
.fullscreenButton {
-moz-appearance: none;
min-height: 72px;
min-width: 72px;
......@@ -45,33 +52,31 @@
border: none !important;
}
.fullscreenButton {
background: url("chrome://browser/skin/images/fullscreen-hdpi.png") no-repeat center;
.playButton {
background: url("chrome://browser/skin/images/pause-hdpi.png") no-repeat center;
background-size: 42px;
}
.fullscreenButton[fullscreened="true"] {
background: url("chrome://browser/skin/images/exitfullscreen-hdpi.png") no-repeat center;
.playButton[paused="true"] {
background: url("chrome://browser/skin/images/play-hdpi.png") no-repeat center;
background-size: 42px;
}
.playButton {
background: url("chrome://browser/skin/images/pause-hdpi.png") no-repeat center;
.castingButton {
background: url("chrome://browser/skin/images/cast-ready-hdpi.png") no-repeat center;
background-size: 42px;
}
/*
* Normally the button bar has fullscreen spacer play spacer mute, but if
* this is an audio control rather than a video control, the fullscreen button
* is hidden by videocontrols.xml, and that alters the position of the
* play button. This workaround moves it back to center.
*/
.controlBar.audio-only .playButton {
transform: translateX(28px);
.castingButton[active="true"] {
background: url("chrome://browser/skin/images/cast-active-hdpi.png") no-repeat center;
background-size: 42px;
}
.playButton[paused="true"] {
background: url("chrome://browser/skin/images/play-hdpi.png") no-repeat center;
/* If the casting button is showing, there will be two buttons on the right side of the controls.
* This shifts the play button to be centered.
*/
.castingButton:not([hidden="true"]) + .fullscreenButton + spacer + .playButton {
transform: translateX(-21px);
background-size: 42px;
}
......@@ -85,6 +90,21 @@
background-size: 42px;
}
.fullscreenButton {
background-color: transparent;
background: url("chrome://browser/skin/images/fullscreen-hdpi.png") no-repeat center;
background-size: 42px;
}
.fullscreenButton[fullscreened] {
background: url("chrome://browser/skin/images/exitfullscreen-hdpi.png") no-repeat center;
background-size: 42px;
}
.controlBar[fullscreen-unavailable] .fullscreenButton {
display: none;
}
/* bars */
.scrubberStack {
width: 100%;
......@@ -178,11 +198,11 @@
}
.statusIcon[type="throbber"] {
background: url("chrome://browser/skin/images/throbber.png") no-repeat center;
background: url(chrome://browser/skin/media/throbber.png) no-repeat center;
}
.statusIcon[type="error"] {
background: url("chrome://browser/skin/images/error.png") no-repeat center;
background: url(chrome://browser/skin/media/error.png) no-repeat center;
}
/* CSS Transitions */
......@@ -206,7 +226,6 @@
}
.volumeStack,
.controlBar[firstshow="true"] .fullscreenButton,
.controlBar[firstshow="true"] .muteButton,
.controlBar[firstshow="true"] .scrubberStack,
.controlBar[firstshow="true"] .durationBox,
......@@ -214,6 +233,10 @@
display: none;
}
.controlBar[firstshow="true"] .playButton {
-moz-transform: none;
}
/* Error description formatting */
.errorLabel {
font-family: Helvetica, Arial, sans-serif;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment