From be6a4802326b1748e85c0d6fdadf06e70e6ecbb0 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 5 Dec 2017 10:44:11 +0100 Subject: [PATCH] Design video player --- .../+video-watch/video-watch.component.html | 11 +- .../+video-watch/video-watch.component.scss | 18 +- .../+video-watch/video-watch.component.ts | 11 +- .../src/assets/player/images/arrow-down.svg | 14 + client/src/assets/player/images/arrow-up.svg | 14 + .../src/assets/player/images/fullscreen.svg | 18 + .../src/assets/player/images/volume-mute.svg | 16 + client/src/assets/player/images/volume.svg | 13 + .../assets/player/peertube-videojs-plugin.ts | 98 ++- client/src/sass/video-js-custom.scss | 559 +++++++++--------- 10 files changed, 445 insertions(+), 327 deletions(-) create mode 100644 client/src/assets/player/images/arrow-down.svg create mode 100644 client/src/assets/player/images/arrow-up.svg create mode 100644 client/src/assets/player/images/fullscreen.svg create mode 100644 client/src/assets/player/images/volume-mute.svg create mode 100644 client/src/assets/player/images/volume.svg diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html index f528d73c3..aa1f2f77e 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.html +++ b/client/src/app/videos/+video-watch/video-watch.component.html @@ -15,20 +15,13 @@
-
- +
+
Video not found :'(
- -
-
Download: {{ downloadSpeed | bytes }}/s
-
Upload: {{ uploadSpeed | bytes }}/s
-
Number of peers: {{ numPeers }}
-
-
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss index cad21dd18..06c2de7c6 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss @@ -1,6 +1,12 @@ #video-container { - width: 100%; - height: 100%; + background-color: #000; + display: flex; + justify-content: center; + + #video-element { + width: 888px; + height: 500px; + } } #video-not-found { @@ -11,14 +17,6 @@ font-weight: bold; } -.embed-responsive { - height: 500px; - - @media screen and (max-width: 600px) { - height: 300px; - } -} - #torrent-info { font-size: 10px; margin-top: 10px; diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts index eac676be8..48842602e 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts @@ -26,13 +26,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy { @ViewChild('videoShareModal') videoShareModal: VideoShareComponent @ViewChild('videoReportModal') videoReportModal: VideoReportComponent - downloadSpeed: number error = false loading = false - numPeers: number player: videojs.Player playerElement: HTMLMediaElement - uploadSpeed: number userRating: UserVideoRateType = null video: VideoDetails = null videoPlayerLoaded = false @@ -283,7 +280,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { return this.router.navigate([ '/videos/list' ]) } - this.playerElement = this.elementRef.nativeElement.querySelector('#video-container') + this.playerElement = this.elementRef.nativeElement.querySelector('#video-element') const videojsOptions = { controls: true, @@ -306,12 +303,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.on('customError', (event, data) => { self.handleError(data.err) }) - - this.on('torrentInfo', (event, data) => { - self.downloadSpeed = data.downloadSpeed - self.numPeers = data.numPeers - self.uploadSpeed = data.uploadSpeed - }) }) this.setVideoDescriptionHTML() diff --git a/client/src/assets/player/images/arrow-down.svg b/client/src/assets/player/images/arrow-down.svg new file mode 100644 index 000000000..3377cdab2 --- /dev/null +++ b/client/src/assets/player/images/arrow-down.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/client/src/assets/player/images/arrow-up.svg b/client/src/assets/player/images/arrow-up.svg new file mode 100644 index 000000000..b1a7890a8 --- /dev/null +++ b/client/src/assets/player/images/arrow-up.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/client/src/assets/player/images/fullscreen.svg b/client/src/assets/player/images/fullscreen.svg new file mode 100644 index 000000000..44e0041a4 --- /dev/null +++ b/client/src/assets/player/images/fullscreen.svg @@ -0,0 +1,18 @@ + + + + fullscreen + Created with Sketch. + + + + + + + + + + + + + diff --git a/client/src/assets/player/images/volume-mute.svg b/client/src/assets/player/images/volume-mute.svg new file mode 100644 index 000000000..0c7c296bc --- /dev/null +++ b/client/src/assets/player/images/volume-mute.svg @@ -0,0 +1,16 @@ + + + + volume-mute + Created with Sketch. + + + + + + + + + + + diff --git a/client/src/assets/player/images/volume.svg b/client/src/assets/player/images/volume.svg new file mode 100644 index 000000000..590913add --- /dev/null +++ b/client/src/assets/player/images/volume.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/client/src/assets/player/peertube-videojs-plugin.ts b/client/src/assets/player/peertube-videojs-plugin.ts index c54d8b5ea..977455bff 100644 --- a/client/src/assets/player/peertube-videojs-plugin.ts +++ b/client/src/assets/player/peertube-videojs-plugin.ts @@ -2,9 +2,24 @@ import videojs, { Player } from 'video.js' import * as WebTorrent from 'webtorrent' +import { VideoFile } from '../../../../shared' import { renderVideo } from './video-renderer' -import { VideoFile } from '../../../../shared' + +// https://github.com/danrevah/ngx-pipes/blob/master/src/pipes/math/bytes.ts +// Don't import all Angular stuff, just copy the code with shame +const dictionaryBytes: Array<{max: number, type: string}> = [ + { max: 1024, type: 'B' }, + { max: 1048576, type: 'KB' }, + { max: 1073741824, type: 'MB' }, + { max: 1.0995116e12, type: 'GB' } +] +function bytes (value) { + const format = dictionaryBytes.find(d => value < d.max) || dictionaryBytes[dictionaryBytes.length - 1] + const calc = Math.floor(value / (format.max / 1024)).toString() + + return [ calc, format.type ] +} // videojs typings don't have some method we need const videojsUntyped = videojs as any @@ -62,6 +77,7 @@ const ResolutionMenuButton = videojsUntyped.extend(MenuButton, { update: function () { this.label.innerHTML = this.player_.getCurrentResolutionLabel() + this.hide() return MenuButton.prototype.update.call(this) }, @@ -74,8 +90,7 @@ MenuButton.registerComponent('ResolutionMenuButton', ResolutionMenuButton) const Button = videojsUntyped.getComponent('Button') const PeertubeLinkButton = videojsUntyped.extend(Button, { constructor: function (player) { - Button.apply(this, arguments) - this.player = player + Button.call(this, player) }, createEl: function () { @@ -90,11 +105,78 @@ const PeertubeLinkButton = videojsUntyped.extend(Button, { }, handleClick: function () { - this.player.pause() + this.player_.pause() } }) Button.registerComponent('PeerTubeLinkButton', PeertubeLinkButton) +const WebTorrentButton = videojsUntyped.extend(Button, { + constructor: function (player) { + Button.call(this, player) + }, + + createEl: function () { + const div = document.createElement('div') + + const downloadIcon = document.createElement('span') + downloadIcon.classList.add('icon', 'icon-download') + div.appendChild(downloadIcon) + + const downloadSpeedText = document.createElement('span') + downloadSpeedText.classList.add('download-speed-text') + const downloadSpeedNumber = document.createElement('span') + downloadSpeedNumber.classList.add('download-speed-number') + const downloadSpeedUnit = document.createElement('span') + downloadSpeedText.appendChild(downloadSpeedNumber) + downloadSpeedText.appendChild(downloadSpeedUnit) + div.appendChild(downloadSpeedText) + + const uploadIcon = document.createElement('span') + uploadIcon.classList.add('icon', 'icon-upload') + div.appendChild(uploadIcon) + + const uploadSpeedText = document.createElement('span') + uploadSpeedText.classList.add('upload-speed-text') + const uploadSpeedNumber = document.createElement('span') + uploadSpeedNumber.classList.add('upload-speed-number') + const uploadSpeedUnit = document.createElement('span') + uploadSpeedText.appendChild(uploadSpeedNumber) + uploadSpeedText.appendChild(uploadSpeedUnit) + div.appendChild(uploadSpeedText) + + const peersText = document.createElement('span') + peersText.textContent = ' peers' + peersText.classList.add('peers-text') + const peersNumber = document.createElement('span') + peersNumber.classList.add('peers-number') + div.appendChild(peersNumber) + div.appendChild(peersText) + + div.className = 'vjs-webtorrent' + // Hide the stats before we get the info + div.style.display = 'none' + + this.player_.on('torrentInfo', (event, data) => { + const downloadSpeed = bytes(data.downloadSpeed) + const uploadSpeed = bytes(data.uploadSpeed) + const numPeers = data.numPeers + + downloadSpeedNumber.textContent = downloadSpeed[0] + downloadSpeedUnit.textContent = ' ' + downloadSpeed[1] + + uploadSpeedNumber.textContent = uploadSpeed[0] + uploadSpeedUnit.textContent = ' ' + uploadSpeed[1] + + peersNumber.textContent = numPeers + + div.style.display = 'block' + }) + + return div + } +}) +Button.registerComponent('WebTorrentButton', WebTorrentButton) + type PeertubePluginOptions = { videoFiles: VideoFile[] playerElement: HTMLVideoElement @@ -223,6 +305,12 @@ const peertubePlugin = function (options: PeertubePluginOptions) { } } + const webTorrentButton = new WebTorrentButton(player) + controlBar.webTorrent = controlBar.el().insertBefore(webTorrentButton.el(), controlBar.progressControl.el()) + controlBar.webTorrent.dispose = function () { + this.parentNode.removeChild(this) + } + if (options.autoplay === true) { player.updateVideoFile() } else { @@ -245,7 +333,7 @@ const peertubePlugin = function (options: PeertubePluginOptions) { }, 1000) }) - function handleError (err: Error|string) { + function handleError (err: Error | string) { return player.trigger('customError', { err }) } } diff --git a/client/src/sass/video-js-custom.scss b/client/src/sass/video-js-custom.scss index 34a958764..1200c07a5 100644 --- a/client/src/sass/video-js-custom.scss +++ b/client/src/sass/video-js-custom.scss @@ -1,341 +1,314 @@ -// Thanks: https://github.com/kmoskwiak/videojs-resolution-switcher/pull/92/files -.vjs-resolution-button-label { - font-size: 1em; - line-height: 3em; - position: absolute; - top: 0; - left: -1px; - width: 100%; - height: 100%; - text-align: center; - box-sizing: inherit; -} - -.vjs-resolution-button { - outline: 0 !important; +// Thanks: https://github.com/zanechua/videojs-sublime-inspired-skin +$primary-foreground-color: #fff; +$primary-background-color: #000; +$font-size: 13px; +$control-bar-height: 34px; - .vjs-menu { - .vjs-menu-content { - width: 4em; - left: 50%; /* Center the menu, in it's parent */ - margin-left: -2em; /* half of width, to center */ - } +.video-js.vjs-peertube-skin { + font-size: $font-size; + color: $primary-foreground-color; - li { - text-transform: none; - font-size: 1em; - } + .vjs-button > .vjs-icon-placeholder::before { + line-height: $control-bar-height; } -} - -// Thanks: https://github.com/zanechua/videojs-sublime-inspired-skin -// Video JS Sublime Skin -// The following are SCSS variables to automate some of the values. -// But don't feel limited by them. Change/replace whatever you want. + .vjs-mouse-display:before, + .vjs-play-progress:before, + .vjs-volume-level:before { + content: ''; /* Remove Circle From Progress Bar */ + } -// The color of icons, text, and the big play button border. -// Try changing to #0f0 -$primary-foreground-color: #fff; // #fff default + .vjs-audio-button { + display: none; + } -// The default color of control backgrounds is mostly black but with a little -// bit of blue so it can still be seen on all-black video frames, which are common. -// Try changing to #900 -$primary-background-color: #2B333F; // #2B333F default + .vjs-big-play-button { + font-size: 8em; -// Try changing to true -$center-big-play-button: true; // true default + $big-play-width: 3em; + $big-play-height: 1.5em; -.video-js { - /* The base font size controls the size of everything, not just text. - All dimensions use em-based sizes so that the scale along with the font size. - Try increasing it to 15px and see what happens. */ - font-size: 10px; + line-height: $big-play-height; + height: $big-play-height; + width: $big-play-width; - /* The main font color changes the ICON COLORS as well as the text */ - color: $primary-foreground-color; -} + border: 0; + border-radius: 0.3em; -/* The "Big Play Button" is the play button that shows before the video plays. - To center it set the align values to center and middle. The typical location - of the button is the center, but there is trend towards moving it to a corner - where it gets out of the way of valuable content in the poster image.*/ -.vjs-sublime-skin .vjs-big-play-button { - /* The font size is what makes the big play button...big. - All width/height values use ems, which are a multiple of the font size. - If the .video-js font-size is 10px, then 3em equals 30px.*/ - font-size: 8em; - - /* We're using SCSS vars here because the values are used in multiple places. - Now that font size is set, the following em values will be a multiple of the - new font size. If the font-size is 3em (30px), then setting any of - the following values to 3em would equal 30px. 3 * font-size. */ - $big-play-width: 3em; - /* 1.5em = 45px default */ - $big-play-height: 1.5em; - - line-height: $big-play-height; - height: $big-play-height; - width: $big-play-width; - - /* 0.06666em = 2px default */ - border: 0; - /* 0.3em = 9px default */ - border-radius: 0.3em; - - @if $center-big-play-button { - /* Align center */ left: 50%; top: 50%; margin-left: -($big-play-width / 2); margin-top: -($big-play-height / 2); - } @else { - /* Align top left. 0.5em = 15px default */ - left: 0.5em; - top: 0.5em; } -} - -/* The default color of control backgrounds is mostly black but with a little - bit of blue so it can still be seen on all-black video frames, which are common. */ -.video-js .vjs-control-bar, -.video-js .vjs-big-play-button, -.video-js .vjs-menu-button .vjs-menu-content { - /* IE8 - has no alpha support */ - background-color: $primary-background-color; - /* Opacity: 1.0 = 100%, 0.0 = 0% */ - background-color: rgba($primary-background-color, 0.7); - background-color: transparent; -} - -// Make a slightly lighter version of the main background -// for the slider background. -$slider-bg-color: lighten($primary-background-color, 33%); - -/* Slider - used for Volume bar and Progress bar */ -.video-js .vjs-slider { - background-color: $slider-bg-color; - background-color: rgba($slider-bg-color, 0.5); - background-color: rgba(255,255,255,.3); - border-radius: 2px; - height: 6.5px; -} - -/* The slider bar color is used for the progress bar and the volume bar - (the first two can be removed after a fix that's coming) */ -.video-js .vjs-volume-level, -.video-js .vjs-play-progress, -.video-js .vjs-slider-bar { - background: $primary-foreground-color; -} - -/* Enlarged Slider to enable easier tracking. Adjust all the height:6.5px to preferred height for the slider if necessary. */ -.video-js .vjs-progress-holder .vjs-load-progress, -.video-js .vjs-progress-holder .vjs-load-progress div, -.video-js .vjs-progress-holder .vjs-play-progress, -.video-js .vjs-progress-holder .vjs-tooltip-progress-bar { - height: 6.5px; -} - -/* The main progress bar also has a bar that shows how much has been loaded. */ -.video-js .vjs-load-progress { - /* For IE8 we'll lighten the color */ - background: ligthen($slider-bg-color, 25%); - /* Otherwise we'll rely on stacked opacities */ - background: rgba($slider-bg-color, 0.5); -} - -/* The load progress bar also has internal divs that represent - smaller disconnected loaded time ranges */ -.video-js .vjs-load-progress div { - /* For IE8 we'll lighten the color */ - background: ligthen($slider-bg-color, 50%); - /* Otherwise we'll rely on stacked opacities */ - background: rgba($slider-bg-color, 0.75); -} - -//Skin Style Starts -.vjs-sublime-skin .vjs-poster { - outline: none; /* Remove Blue Outline on Click*/ - outline: 0; -} -.vjs-sublime-skin:hover .vjs-big-play-button { + &:hover .vjs-big-play-button { background-color: transparent; -} - -.vjs-sublime-skin .vjs-fullscreen-control:before, -.vjs-sublime-skin.vjs-fullscreen .vjs-fullscreen-control:before { - content: ''; /* Remove Fullscreen Exit Icon */ -} - -.vjs-sublime-skin.vjs-fullscreen .vjs-fullscreen-control { - background: #fff; -} - -.vjs-sublime-skin .vjs-fullscreen-control { - border: 3px solid #fff; - box-sizing: border-box; - cursor: pointer; - margin-top: -7px; - top: 50%; - height: 14px; - width: 22px; - margin-right: 10px; -} + } -.vjs-sublime-skin.vjs-fullscreen .vjs-fullscreen-control:after { - background: #000; - content: ""; - display: block; - position: absolute; - bottom: 0; - left: 0; - height: 5px; - width: 5px; -} + .vjs-control-bar, + .vjs-big-play-button, + .vjs-menu-button .vjs-menu-content { + background-color: rgba($primary-background-color, 0.5); + } -.vjs-sublime-skin .vjs-progress-holder { - margin: 0; -} + $slider-bg-color: lighten($primary-background-color, 33%); -.vjs-sublime-skin .vjs-progress-control .vjs-progress-holder:after { + .vjs-slider { + background-color: rgba(255, 255, 255, .3); border-radius: 2px; - display: block; - height: 6.5px; -} - -.vjs-sublime-skin .vjs-progress-control .vjs-load-progres, -.vjs-sublime-skin .vjs-progress-control .vjs-play-progress { - border-radius: 2px; - height: 6.5px; -} + height: 5px; + } -.vjs-sublime-skin .vjs-playback-rate { - display: none; /* Remove Playback Rate */ -} + /* The slider bar color is used for the progress bar and the volume bar + (the first two can be removed after a fix that's coming) */ + .vjs-volume-level, + .vjs-play-progress, + .vjs-slider-bar { + background: $primary-foreground-color; + } -.vjs-sublime-skin .vjs-progress-control { - margin-right: 50px; -} + .vjs-load-progress { + background: rgba($slider-bg-color, 0.5); + } -.vjs-sublime-skin .vjs-time-control { - right: 55px; -} + .vjs-load-progress div { + background: rgba($slider-bg-color, 0.75); + } -.vjs-sublime-skin .vjs-volume-menu-button:before { - width: 1.2em; - z-index: 1; -} + .vjs-poster { + outline: none; /* Remove Blue Outline on Click*/ + outline: 0; + } -.vjs-sublime-skin .vjs-volume-menu-button .vjs-menu, -.vjs-sublime-skin .vjs-volume-menu-button:focus .vjs-menu, -.vjs-sublime-skin .vjs-volume-menu-button.vjs-slider-active .vjs-menu { - display: block; - opacity: 1; -} + .vjs-control-bar { + height: $control-bar-height; -.vjs-sublime-skin .vjs-volume-menu-button, -.vjs-sublime-skin .vjs-volume-panel { - width: 6em; - position: absolute; - right: 0; - margin-right: 65px; -} + .vjs-progress-control { + bottom: 34px; + width: 100%; + position: absolute; + height: 5px; -.vjs-sublime-skin .vjs-volume-menu-button .vjs-menu-content, -.vjs-sublime-skin .vjs-volume-menu-button:hover, -.vjs-sublime-skin .vjs-volume-menu-button:focus, -.vjs-sublime-skin .vjs-volume-menu-button.vjs-slider-active, -.vjs-sublime-skin .vjs-volume-panel .vjs-volume-control, -.vjs-sublime-skin .vjs-volume-panel:hover, -.vjs-sublime-skin .vjs-volume-panel:focus, -.vjs-sublime-skin .vjs-volume-panel.vjs-slider-active { - width: 6em; -} + .vjs-progress-holder { + margin: 0; + border-radius: 0; + } + } -.vjs-sublime-skin .vjs-volume-menu-button .vjs-menu { - left: 23px; -} + .vjs-play-control { + font-size: $font-size; + padding: 0 17px; + margin-right: 5px; + } -.vjs-sublime-skin .vjs-mouse-display:before, -.vjs-sublime-skin .vjs-play-progress:before, -.vjs-sublime-skin .vjs-volume-level:before { - content: ''; /* Remove Circle From Progress Bar */ -} + .vjs-time-control { + &.vjs-current-time { + font-size: $font-size; + display: inline-block; + padding: 0; + + .vjs-current-time-display { + line-height: $control-bar-height; + + &::after { + content: "/"; + margin: 0 1px 0 2px; + } + } + } + + &.vjs-duration { + font-size: $font-size; + display: inline-block; + padding: 0; + + .vjs-duration-display { + line-height: $control-bar-height; + } + } + + &.vjs-remaining-time { + display: none; + } + } -.vjs-sublime-skin .vjs-mouse-display:after, -.vjs-sublime-skin .vjs-play-progress:after, -.vjs-sublime-skin .vjs-time-tooltip { - width: 5.5em; -} + .vjs-webtorrent { + width: 100%; + line-height: $control-bar-height; + text-align: right; + padding-right: 60px; + + .download-speed-number, .upload-speed-number, .peers-number { + font-weight: $font-semibold; + } + + .download-speed-text, .upload-speed-text, .peers-text { + margin-right: 15px; + } + + .icon { + display: inline-block; + width: 15px; + height: 15px; + background-size: contain; + vertical-align: middle; + background-repeat: no-repeat; + margin-right: 6px; + position: relative; + top: -1px; + + &.icon-download { + background-image: url('../assets/player/images/arrow-down.svg'); + } + + &.icon-upload { + background-image: url('../assets/player/images/arrow-up.svg'); + } + } + } -.vjs-sublime-skin .vjs-audio-button { - display: none; -} + .vjs-mute-control { + .vjs-icon-placeholder { + display: inline-block; + width: 22px; + height: 22px; + vertical-align: middle; + background: url('../assets/player/images/volume.svg') no-repeat; + background-size: contain; + + &::before { + content: ''; + } + } + + &.vjs-vol-0 .vjs-icon-placeholder { + background: url('../assets/player/images/volume-mute.svg') no-repeat; + background-size: contain; + } + } -.vjs-sublime-skin .vjs-volume-bar { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAcCAQAAACw95UnAAAAMElEQVRIx2NgoBL4n4YKGUYNHkEG4zJg1OCRYDCpBowaPJwMppbLRg0eNXjUYBLEAXWNUA6QNm1lAAAAAElFTkSuQmCC); - background-size: 22px 14px; - background-repeat: no-repeat; - height: 100%; - width: 100%; - max-width: 22px; - max-height: 14px; - margin: 7px 4px; - border-radius: 0; -} + .vjs-volume-menu-button, + .vjs-volume-panel { + width: 6em; + position: absolute; + right: 0; + margin-right: 65px; + } -.vjs-sublime-skin .vjs-volume-level { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAcAQAAAAAyhWABAAAAAnRSTlMAAHaTzTgAAAAZSURBVHgBYwAB/g9EUv+JokCqiaT+U4MCAPKPS7WUUOc1AAAAAElFTkSuQmCC); - background-size: 22px 14px; - background-repeat: no-repeat; - max-width: 22px; - max-height: 14px; - height: 100%; -} + .vjs-volume-bar { + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAcCAQAAACw95UnAAAAMElEQVRIx2NgoBL4n4YKGUYNHkEG4zJg1OCRYDCpBowaPJwMppbLRg0eNXjUYBLEAXWNUA6QNm1lAAAAAElFTkSuQmCC) no-repeat; + background-size: 22px 14px; + height: 100%; + width: 100%; + max-width: 22px; + max-height: 14px; + margin: 7px 4px; + border-radius: 0; + top: 3px; + + .vjs-volume-level { + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAcAQAAAAAyhWABAAAAAnRSTlMAAHaTzTgAAAAZSURBVHgBYwAB/g9EUv+JokCqiaT+U4MCAPKPS7WUUOc1AAAAAElFTkSuQmCC) no-repeat; + background-size: 22px 14px; + max-width: 22px; + max-height: 14px; + height: 100%; + } + } -/* New for VideoJS v6 */ -.vjs-sublime-skin .vjs-volume-panel.vjs-volume-panel-horizontal.vjs-slider-active, -.vjs-sublime-skin .vjs-volume-panel.vjs-volume-panel-horizontal:active, -.vjs-sublime-skin .vjs-volume-panel.vjs-volume-panel-horizontal:focus, -.vjs-sublime-skin .vjs-volume-panel.vjs-volume-panel-horizontal:hover { - width: 6em; - transition-property: none; -} + .vjs-volume-panel.vjs-volume-panel-horizontal.vjs-slider-active, + .vjs-volume-panel.vjs-volume-panel-horizontal:active, + .vjs-volume-panel.vjs-volume-panel-horizontal:focus, + .vjs-volume-panel.vjs-volume-panel-horizontal:hover { + width: 6em; + transition-property: none; + } -.vjs-sublime-skin .vjs-volume-panel .vjs-mute-control:hover ~ .vjs-volume-control.vjs-volume-horizontal { - width: 3em; - height: auto; -} + .vjs-volume-panel .vjs-mute-control:hover ~ .vjs-volume-control.vjs-volume-horizontal { + width: 3em; + height: auto; + } -.vjs-sublime-skin .vjs-volume-panel .vjs-mute-control:hover ~ .vjs-volume-control { - transition-property: none; -} + .vjs-volume-panel .vjs-mute-control:hover ~ .vjs-volume-control { + transition-property: none; + } -.vjs-sublime-skin .vjs-fullscreen-control .vjs-icon-placeholder { - display: none; /* Remove Duplicate Fullscreen Icon */ -} + .vjs-volume-panel { + .vjs-mute-control { + width: 2em; + z-index: 1; + padding: 0; + } + + .vjs-volume-control { + display: inline-block; + position: relative; + left: 5px; + opacity: 1; + width: 3em; + height: auto; + } + } -.vjs-sublime-skin .vjs-volume-panel .vjs-mute-control { - width: 2em; - z-index: 1; - padding: 0; -} + .vjs-fullscreen-control { + width: 37px; + + .vjs-icon-placeholder { + display: inline-block; + width: 22px; + height: 22px; + vertical-align: middle; + background: url('../assets/player/images/fullscreen.svg') no-repeat; + background-size: contain; + + &::before { + content: ''; + } + } + } -.vjs-sublime-skin .vjs-volume-panel .vjs-volume-control { - display: inline-block; - position: relative; - left: 5px; - opacity: 1; - width: 3em; - height: auto; + .vjs-menu-button-popup { + font-size: 13px; + font-weight: $font-semibold; + width: 42px; + + // Thanks: https://github.com/kmoskwiak/videojs-resolution-switcher/pull/92/files + .vjs-resolution-button-label { + line-height: $control-bar-height; + position: absolute; + top: 0; + left: -1px; + width: 100%; + height: 100%; + text-align: center; + box-sizing: inherit; + } + + .vjs-resolution-button { + outline: 0 !important; + } + + .vjs-menu { + top: 20px; + + .vjs-menu-content { + width: 4em; + left: 50%; /* Center the menu, in it's parent */ + margin-left: -2em; /* half of width, to center */ + } + + li { + text-transform: none; + font-size: 13px; + } + } + } + } } // Thanks: https://projects.lukehaas.me/css-loaders/ .vjs-loading-spinner { margin: 0 !important; - position: absolute; + //position: absolute; // 15px is the nav bar height top: calc(50% - 15px); left: 50%; -- 2.25.1