X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fvideo-js-custom.scss;h=f77447e97baa257006f37cbd699fc83f7e5c32af;hb=e6f627975bebd00d396d11442e582d80856bc6bd;hp=2fcfc6203dd057f1ba7ba7d13f367296e9076797;hpb=a86309b4af9ad8391822f628d74fc5c7d1a01974;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/sass/video-js-custom.scss b/client/src/sass/video-js-custom.scss index 2fcfc6203..f77447e97 100644 --- a/client/src/sass/video-js-custom.scss +++ b/client/src/sass/video-js-custom.scss @@ -1,20 +1,57 @@ -// Thanks: https://github.com/zanechua/videojs-sublime-inspired-skin +@import '_variables'; +@import '_mixins'; + +@mixin big-play-button-triangle-size($triangle-size) { + width: $triangle-size; + height: $triangle-size; + top: calc(50% - #{$triangle-size / 2}); + left: calc(53% - #{($triangle-size / 2)}); +} + $primary-foreground-color: #fff; +$primary-foreground-opacity: 0.9; +$primary-foreground-opacity-hover: 1; $primary-background-color: #000; + $font-size: 13px; $control-bar-height: 34px; +$slider-bg-color: lighten($primary-background-color, 33%); + +$setting-transition-duration: 0.15s; +$setting-transition-easing: ease-out; + .video-js.vjs-peertube-skin { font-size: $font-size; color: $primary-foreground-color; + .vjs-dock-text { + padding-right: 10px; + } + + .vjs-dock-description { + font-size: 11px; + + &::before, &::after { + display: inline-block; + content: '\1F308'; + } + + &::before { + margin-right: 4px; + } + + &::after { + margin-left: 4px; + transform: scale(-1, 1); + } + } + .vjs-button > .vjs-icon-placeholder::before { line-height: $control-bar-height; } - .vjs-mouse-display:before, - .vjs-play-progress:before, - .vjs-volume-level:before { + .vjs-volume-level::before { content: ''; /* Remove Circle From Progress Bar */ } @@ -23,56 +60,105 @@ $control-bar-height: 34px; } .vjs-big-play-button { - font-size: 8em; + outline: 0; + font-size: 6em; - $big-play-width: 3em; - $big-play-height: 1.5em; + $big-play-width: 1.2em; + $big-play-height: 1.2em; - line-height: $big-play-height; - height: $big-play-height; - width: $big-play-width; - - border: 0; - border-radius: 0.3em; + border: 6px solid #fff; + border-radius: 100%; left: 50%; top: 50%; + width: $big-play-width; + height: $big-play-height; + line-height: $big-play-height; margin-left: -($big-play-width / 2); margin-top: -($big-play-height / 2); + transition: 0.4s opacity; + + &::-moz-focus-inner { + border: 0; + padding: 0 + } + + .vjs-icon-placeholder::before { + @include big-play-button-triangle-size(45px); + + content: ''; + background-image: url('../assets/player/images/big-play-button.svg'); + } + + &:hover { + opacity: 0.8; + } + } + + // Small effect when we click on the play button + &.vjs-has-big-play-button-clicked { + + .vjs-big-play-button, .vjs-poster { + display: block; + visibility: hidden; + + &.vjs-big-play-button, &.vjs-big-play-button::before { + opacity: 0; + transition: visibility 0.2s, opacity 0.2s; + } + + &.vjs-poster, &.vjs-poster::before { + opacity: 0; + transition: visibility 0.3s, opacity 0.3s; + transition-delay: 0.05s; + } + } } - &:hover .vjs-big-play-button { - background-color: transparent; + // Hide the big play button on autoplay + &.vjs-has-autoplay { + .vjs-big-play-button { + display: none !important; + } } .vjs-control-bar, .vjs-big-play-button, - .vjs-menu-button .vjs-menu-content { + .vjs-settings-dialog { background-color: rgba($primary-background-color, 0.5); } - $slider-bg-color: lighten($primary-background-color, 33%); - .vjs-slider { background-color: rgba(255, 255, 255, .3); border-radius: 2px; height: 5px; + + .vjs-slider-bar { + background: $primary-foreground-color; + } } - /* 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-play-progress { + + &::before { + top: -0.3em; + + &:hover { + top: -0.372em; + } + } + + .vjs-time-tooltip { + display: none; + } } .vjs-load-progress { background: rgba($slider-bg-color, 0.5); - } - .vjs-load-progress div { - background: rgba($slider-bg-color, 0.75); + div { + background: rgba($slider-bg-color, 0.75); + } } .vjs-poster { @@ -83,6 +169,32 @@ $control-bar-height: 34px; .vjs-control-bar { height: $control-bar-height; + .vjs-progress-control, + .vjs-play-control, + .vjs-playback-rate, + .vjs-mute-control, + .vjs-volume-control, + .vjs-resolution-control, + .vjs-fullscreen-control, + .vjs-peertube-link, + .vjs-settings + { + color: $primary-foreground-color !important; + opacity: $primary-foreground-opacity; + transition: opacity .1s; + + &:hover { + opacity: $primary-foreground-opacity-hover; + } + } + + .vjs-current-time, + .vjs-duration, + .vjs-peertube { + color: $primary-foreground-color; + opacity: $primary-foreground-opacity; + } + .vjs-progress-control { bottom: 34px; width: 100%; @@ -96,6 +208,9 @@ $control-bar-height: 34px; } .vjs-play-control { + @include disable-outline; + + cursor: pointer; font-size: $font-size; padding: 0 17px; margin-right: 5px; @@ -108,7 +223,7 @@ $control-bar-height: 34px; padding: 0; .vjs-current-time-display { - line-height: $control-bar-height; + line-height: calc(#{$control-bar-height} + 1px); &::after { content: "/"; @@ -121,9 +236,8 @@ $control-bar-height: 34px; font-size: $font-size; display: inline-block; padding: 0; - .vjs-duration-display { - line-height: $control-bar-height; + line-height: calc(#{$control-bar-height} + 1px); } } @@ -132,17 +246,16 @@ $control-bar-height: 34px; } } - .vjs-webtorrent { + .vjs-peertube { width: 100%; line-height: $control-bar-height; text-align: right; - padding-right: 60px; - .vjs-webtorrent-displayed { + .vjs-peertube-displayed { display: block; } - .vjs-webtorrent-hidden { + .vjs-peertube-hidden { display: none; } @@ -175,7 +288,27 @@ $control-bar-height: 34px; } } + .vjs-playback-rate { + font-size: 10px; + width: 37px !important; + + .vjs-playback-rate-value { + font-size: 13px; + line-height: $control-bar-height; + } + + .vjs-menu .vjs-menu-content { + width: 37px !important; + } + } + .vjs-mute-control { + @include disable-outline; + + line-height: $control-bar-height; + padding: 0; + width: 30px; + .vjs-icon-placeholder { display: inline-block; width: 22px; @@ -195,12 +328,9 @@ $control-bar-height: 34px; } } - .vjs-volume-menu-button, - .vjs-volume-panel { - width: 6em; - position: absolute; - right: 0; - margin-right: 65px; + .vjs-volume-control { + width: 30px; + margin: 0 5px 0 0; } .vjs-volume-bar { @@ -257,7 +387,19 @@ $control-bar-height: 34px; } } + .vjs-peertube-link { + @include disable-outline; + @include disable-default-a-behaviour; + + text-decoration: none; + line-height: $control-bar-height; + font-weight: $font-semibold; + padding: 0 5px; + } + .vjs-fullscreen-control { + @include disable-outline; + width: 37px; .vjs-icon-placeholder { @@ -275,33 +417,20 @@ $control-bar-height: 34px; } .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; - } + width: 50px; .vjs-resolution-button { - outline: 0 !important; + @include disable-outline; } .vjs-menu { top: 20px; + left: 0; .vjs-menu-content { - width: 4em; - left: 50%; /* Center the menu, in it's parent */ - margin-left: -2em; /* half of width, to center */ + width: 50px; + bottom: 20px; } li { @@ -312,33 +441,111 @@ $control-bar-height: 34px; } } - @media screen and (max-width: 450px) { - .vjs-webtorrent-displayed { + @media screen and (max-width: 570px) { + .vjs-dock-text { + font-size: 14px; + } + + .vjs-dock-description { + font-size: 9px; + } + + .vjs-big-play-button { + font-size: 4.5em; + border-width: 4.5px; + + .vjs-icon-placeholder::before { + @include big-play-button-triangle-size(27px); + } + } + + .vjs-playback-rate { + display: none; + } + + .vjs-peertube { + padding: 0 !important; + + .vjs-peertube-displayed { + display: none !important; + } + } + } + + @media screen and (max-width: 300px) { + .vjs-dock-text { + font-size: 13px; + } + + .vjs-big-play-button { + font-size: 3em; + border-width: 3px; + + .vjs-icon-placeholder::before { + @include big-play-button-triangle-size(20px); + } + } + + .vjs-volume-control { display: none !important; } + + .vjs-peertube-link { + padding: 0 !important; + } + + .vjs-settings { + width: 33px; + } + } +} + +// Play/pause animations +.vjs-has-started .vjs-play-control { + &.vjs-playing { + animation: remove-pause-button 0.25s ease; + } + + &.vjs-paused { + animation: add-play-button 0.25s ease; + } + + @keyframes remove-pause-button { + 0% { + transform: rotate(90deg); + } + 100% { + transform: rotate(0deg); + } + } + + @keyframes add-play-button { + 0% { + transform: rotate(-90deg); + } + 100% { + transform: rotate(0deg); + } } } // Thanks: https://projects.lukehaas.me/css-loaders/ .vjs-loading-spinner { - margin: 0 !important; - //position: absolute; - // 15px is the nav bar height - top: calc(50% - 15px); left: 50%; font-size: 10px; - position: relative; text-indent: -9999em; border: 0.7em solid rgba(255, 255, 255, 0.2); border-left-color: #ffffff; transform: translateZ(0); - animation: spinner 1.4s infinite linear; + animation: 0.3s ease-out 1.1s forwards vjs-spinner-show, spinner 1.4s infinite linear !important; + overflow: hidden; + visibility: hidden; - &:before { + &::before { animation: none !important; } - &:after { + &::after { border-radius: 50%; width: 6em; height: 6em; @@ -353,5 +560,216 @@ $control-bar-height: 34px; transform: rotate(360deg); } } + + @keyframes vjs-spinner-show { + 0% { + display: none; + opacity: 0; + } + + 1% { + display: block; + visibility: visible; + opacity: 0; + } + + 100% { + display: block; + visibility: visible; + opacity: 1; + } + } +} + +// Error display disabled +.vjs-error:not(.vjs-error-display-enabled) { + .vjs-error-display { + display: none; + } + + .vjs-loading-spinner { + display: block; + } } +// Error display enabled +.vjs-error.vjs-error-display-enabled { + .vjs-error-display { + display: block; + } +} + + +/* Sass for videojs-settings-menu */ + +.video-js { + + .vjs-settings { + @include disable-outline; + + cursor: pointer; + width: 37px; + + .vjs-icon-placeholder { + display: inline-block; + width: 17px; + height: 17px; + vertical-align: middle; + background: url('../assets/player/images/settings.svg') no-repeat; + background-size: contain; + + &::before { + content: ''; + } + } + } + + .vjs-settings-sub-menu-title { + width: 4em; + text-transform: initial; + } + + .vjs-settings-dialog { + position: absolute; + right: .5em; + bottom: 3.5em; + color: $primary-foreground-color; + opacity: $primary-foreground-opacity; + margin: 0 auto; + font-size: $font-size !important; + + width: auto; + overflow: hidden; + + 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 { + display: table-cell; + padding: 0 5px; + } + + .vjs-settings-sub-menu-title { + text-align: left; + font-weight: $font-semibold; + } + + .vjs-settings-sub-menu-value { + width: 100%; + text-align: right; + + small { + font-size: 0.85em; + opacity: 0.8; + } + } + + .vjs-settings-panel { + position: absolute; + bottom: 0; + right: 0; + overflow-y: auto; + overflow-x: hidden; + border-radius: 1px; + } + + .vjs-settings-panel-child { + display: flex; + + align-items: flex-end; + white-space: nowrap; + + &:focus, + &:active { + outline: none; + } + + > .vjs-menu { + flex: 1; + min-width: 200px; + } + + > .vjs-menu, + > .vjs-settings-sub-menu { + transition: all $setting-transition-duration $setting-transition-easing; + + .vjs-menu-item { + + &:hover { + background-color: rgba(255, 255, 255, 0.2); + } + + &:first-child { + margin-top: 5px; + } + + &:last-child { + margin-bottom: 5px; + } + } + + li { + font-size: 1em; + text-transform: initial; + + &:hover { + cursor: pointer; + } + } + } + + > .vjs-menu { + .vjs-menu-item { + padding: 8px 16px; + } + + .vjs-settings-sub-menu-value::after { + @include chevron-right(9px, 2px); + + margin-left: 5px; + } + } + + > .vjs-settings-sub-menu { + width: 80px; + + .vjs-menu-item { + outline: 0; + font-weight: $font-semibold; + + padding: 5px 8px; + text-align: right; + + &.vjs-back-button { + background-color: inherit; + padding: 8px 8px 13px 8px; + margin-bottom: 5px; + border-bottom: 1px solid grey; + + &::before { + @include chevron-left(9px, 2px); + + margin-right: 5px; + } + } + + &.vjs-selected { + background-color: inherit; + color: inherit; + position: relative; + + &::before { + @include icon(15px); + + position: absolute; + left: 8px; + content: ' '; + margin-top: 1px; + background-image: url('../assets/player/images/tick.svg'); + } + } + } + } + } + } +} \ No newline at end of file