Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix pip button z-index on firefox

Chocobozzz6b0ae9f0829e
diff --git a/client/src/standalone/player/src/sass/shared/context-menu.scss b/client/src/standalone/player/src/sass/shared/context-menu.scss
index 84f5928d16..21dd487df7 100644
--- a/client/src/standalone/player/src/sass/shared/context-menu.scss
+++ b/client/src/standalone/player/src/sass/shared/context-menu.scss
@@ -1,6 +1,6 @@
-@use '_variables' as *;
-@use '_mixins' as *;
-@use './_player-variables' as *;
+@use "_variables" as *;
+@use "_mixins" as *;
+@use "./_player-variables" as *;
$context-menu-width: 350px;
@@ -8,7 +8,7 @@ $context-menu-width: 350px;
.video-js .vjs-contextmenu-ui-menu {
position: absolute;
- background-color: $primary-background-color;
+ background-color: var(--embed-background-color);
padding: 8px 0;
border-radius: 4px;
width: $context-menu-width;
@@ -32,7 +32,7 @@ $context-menu-width: 350px;
background-color: rgba(255, 255, 255, 0.2);
}
- [class^='vjs-icon-'] {
+ [class^="vjs-icon-"] {
display: inline-flex;
position: relative;
top: 2px;
@@ -46,16 +46,16 @@ $context-menu-width: 350px;
@include margin-right(0.8rem !important);
- $icons: 'link-2', 'repeat', 'code', 'tick-white', 'info';
+ $icons: "link-2", "repeat", "code", "tick-white", "info";
@each $icon in $icons {
&[class$="-#{$icon}"] {
- mask-image: url('./svg/#{$icon}.svg');
- -webkit-mask-image: url('./svg/#{$icon}.svg');
+ mask-image: url("./svg/#{$icon}.svg");
+ -webkit-mask-image: url("./svg/#{$icon}.svg");
}
}
- &[class$='-tick-white'] {
+ &[class$="-tick-white"] {
float: right;
margin: 0 !important;
}
diff --git a/client/src/standalone/player/src/sass/shared/peertube-skin.scss b/client/src/standalone/player/src/sass/shared/peertube-skin.scss
index 381bde83a0..0e5f3e6f9e 100644
--- a/client/src/standalone/player/src/sass/shared/peertube-skin.scss
+++ b/client/src/standalone/player/src/sass/shared/peertube-skin.scss
@@ -1,12 +1,22 @@
-@use 'sass:math';
-@use '_variables' as *;
-@use '_mixins' as *;
-@use './_player-variables' as *;
+@use "sass:math";
+@use "_variables" as *;
+@use "_mixins" as *;
+@use "./_player-variables" as *;
body {
--embed-foreground-color: #{$primary-foreground-color};
+ --embed-background-color: #{$primary-background-color};
--embed-big-play-background-color: #{$primary-background-color};
+
+ // Prevent z-index bug with Firefox PiP button
+ // See:
+ // * https://bugzilla.mozilla.org/show_bug.cgi?id=1742585
+ // * https://bugzilla.mozilla.org/show_bug.cgi?id=1742585
+ // * https://bugzilla.mozilla.org/show_bug.cgi?id=1754604
+ @supports (-moz-orient: block) {
+ --embed-background-color: #000;
+ }
}
@mixin big-play-button-triangle-size($triangle-size) {
@@ -59,8 +69,8 @@ body {
}
.vjs-icon-placeholder::before {
- content: '';
- background-image: url('./svg/big-play-button.svg');
+ content: "";
+ background-image: url("./svg/big-play-button.svg");
@include big-play-button-triangle-size(45px);
}
@@ -104,11 +114,6 @@ body {
background-color: pvar(--embed-big-play-bg);
}
- .vjs-settings-dialog,
- .vjs-control-bar {
- background-color: $primary-background-color;
- }
-
.vjs-poster {
outline: 0;
background-size: cover;
@@ -197,7 +202,6 @@ body {
}
}
-
// ---------------------------------------------------------------------------
// Custom media queries
// ---------------------------------------------------------------------------
diff --git a/client/src/standalone/player/src/sass/shared/settings-menu.scss b/client/src/standalone/player/src/sass/shared/settings-menu.scss
index 0353c0b312..a808cce169 100644
--- a/client/src/standalone/player/src/sass/shared/settings-menu.scss
+++ b/client/src/standalone/player/src/sass/shared/settings-menu.scss
@@ -1,7 +1,7 @@
-@use '_variables' as *;
-@use '_mixins' as *;
-@use '_icons' as *;
-@use './_player-variables' as *;
+@use "_variables" as *;
+@use "_mixins" as *;
+@use "_icons" as *;
+@use "./_player-variables" as *;
$setting-transition-duration: 0.15s;
$setting-transition-easing: ease-out;
@@ -9,7 +9,6 @@ $setting-transition-easing: ease-out;
/* Sass for videojs-settings-menu */
.video-js {
-
.vjs-settings-sub-menu-title {
width: 4em;
text-transform: initial;
@@ -17,19 +16,21 @@ $setting-transition-easing: ease-out;
.vjs-settings-dialog {
position: absolute;
- right: .5em;
+ right: 0.5em;
bottom: 4em;
color: pvar(--embed-fg);
- opacity: $primary-foreground-opacity;
margin: 0 auto;
font-size: $font-size !important;
z-index: 100;
border-radius: 10px;
+ background-color: var(--embed-background-color);
width: auto;
overflow: hidden;
- transition: width $setting-transition-duration $setting-transition-easing, height $setting-transition-duration $setting-transition-easing;
+ transition:
+ width $setting-transition-duration $setting-transition-easing,
+ height $setting-transition-duration $setting-transition-easing;
.vjs-settings-sub-menu-value,
.vjs-settings-sub-menu-title {
@@ -143,9 +144,9 @@ $setting-transition-easing: ease-out;
&::before {
position: absolute;
- content: ' ';
+ content: " ";
margin-top: 1px;
- background-image: url('./svg/tick-white.svg');
+ background-image: url("./svg/tick-white.svg");
@include icon(15px);
@include left(15px);
@@ -183,7 +184,7 @@ $setting-transition-easing: ease-out;
}
}
-:root[dir=rtl] {
+:root[dir="rtl"] {
.vjs-back-button::before {
transform: rotate(45deg) !important;
}