Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: Reorder SASS styles to address deprecation #8821

Merged
merged 1 commit into from
Jul 31, 2024
Merged

refactor: Reorder SASS styles to address deprecation #8821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/css/components/_close-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.video-js .vjs-control.vjs-close-button {
& .vjs-icon-placeholder {
@extend .vjs-icon-cancel;
}

cursor: pointer;
height: 3em;
position: absolute;
right: 0;
top: 0.5em;
z-index: 2;

& .vjs-icon-placeholder {
@extend .vjs-icon-cancel;
}
}
6 changes: 3 additions & 3 deletions src/css/components/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
// Avoiding helvetica: issue #376
font-family: $text-font-family;

// reset word-break inside the player div
word-break: initial;

// Fix for Firefox 9 fullscreen (only if it is enabled). Not needed when
// checking fullScreenEnabled.
&:-moz-full-screen { position: absolute; }
Expand All @@ -29,9 +32,6 @@
width: 100% !important;
height: 100% !important;
}

// reset word-break inside the player div
word-break: initial;
}

.video-js[tabindex="-1"] {
Expand Down
15 changes: 8 additions & 7 deletions src/css/components/_volume.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,30 @@
}

.video-js .vjs-volume-panel {
@include transition(width 1s);

&.vjs-hover .vjs-volume-control,
&:active .vjs-volume-control,
&:focus .vjs-volume-control,
& .vjs-volume-control:active,
&.vjs-hover .vjs-mute-control ~ .vjs-volume-control,
& .vjs-volume-control.vjs-slider-active {
visibility: visible;
opacity: 1;
position: relative;
$transition-property: visibility 0.1s, opacity 0.1s, height 0.1s, width 0.1s, left 0s, top 0s;
@include transition($transition-property);

&.vjs-volume-horizontal {
width: 5em;
height: 3em;
margin-right: 0;
}
visibility: visible;
opacity: 1;
position: relative;

&.vjs-volume-vertical {
left: -3.5em;
@include transition(left 0s);
}
$transition-property: visibility 0.1s, opacity 0.1s, height 0.1s, width 0.1s, left 0s, top 0s;
@include transition($transition-property);
}

&.vjs-volume-panel-horizontal {
Expand All @@ -70,8 +73,6 @@
width: 4em;
}
}

@include transition(width 1s);
}

.video-js .vjs-volume-panel .vjs-volume-control.vjs-volume-vertical {
Expand Down