Skip to content

Commit

Permalink
refactor: Reorder SASS styles to address deprecation (#8821)
Browse files Browse the repository at this point in the history
## Description
Some of the existing rules would be interpreted differently in a future
version of SASS. In the current version, they trigger a deprecation
warning. See
https://sass-lang.com/documentation/breaking-changes/mixed-decls/

## Specific Changes proposed
Re-orders rules to maintain current output and remove warnings. The
output of video-js.css and video-js.min.css remains the same.

## Requirements Checklist
- [x] Feature implemented / Bug fixed
- [ ] If necessary, more likely in a feature request than a bug fix
- [x] Change has been verified in an actual browser (Chrome, Firefox,
IE)
  - [ ] Unit Tests updated or fixed
  - [ ] Docs/guides updated
- [ ] Example created ([starter template on
JSBin](https://codepen.io/gkatsev/pen/GwZegv?editors=1000#0))
- [x] Has no DOM changes which impact accessiblilty or trigger warnings
(e.g. Chrome issues tab)
  - [x] Has no changes to JSDoc which cause `npm run docs:api` to error
- [ ] Reviewed by Two Core Contributors
  • Loading branch information
mister-ben authored Jul 31, 2024
1 parent c4007db commit 57c27f8
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
8 changes: 4 additions & 4 deletions src/css/components/_close-button.scss
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
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
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

0 comments on commit 57c27f8

Please sign in to comment.