From 6b9af1293621a81564296ead6f12f5e70eafbca2 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 29 Mar 2018 16:28:07 +0200 Subject: [PATCH] Add opacity effect on control bar icons --- .../assets/player/peertube-videojs-plugin.ts | 4 ++ client/src/sass/video-js-custom.scss | 37 ++++++++++++++++--- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/client/src/assets/player/peertube-videojs-plugin.ts b/client/src/assets/player/peertube-videojs-plugin.ts index 4843e3d8a..22cb27da3 100644 --- a/client/src/assets/player/peertube-videojs-plugin.ts +++ b/client/src/assets/player/peertube-videojs-plugin.ts @@ -126,6 +126,10 @@ class ResolutionMenuButton extends MenuButton { buildCSSClass () { return super.buildCSSClass() + ' vjs-resolution-button' } + + buildWrapperCSSClass () { + return 'vjs-resolution-control ' + super.buildWrapperCSSClass() + } } MenuButton.registerComponent('ResolutionMenuButton', ResolutionMenuButton) diff --git a/client/src/sass/video-js-custom.scss b/client/src/sass/video-js-custom.scss index 4ef1693b5..2fa3527a8 100644 --- a/client/src/sass/video-js-custom.scss +++ b/client/src/sass/video-js-custom.scss @@ -1,7 +1,7 @@ @import '_variables'; @import '_mixins'; -$primary-foreground-color: #fff; +$primary-foreground-color: #eee; $primary-foreground-opacity: 0.9; $primary-foreground-opacity-hover: 1; $primary-background-color: #000; @@ -13,7 +13,7 @@ $slider-bg-color: lighten($primary-background-color, 33%); .video-js.vjs-peertube-skin { font-size: $font-size; - color: $primary-foreground-color; + color: #fff; .vjs-dock-text { padding-right: 10px; @@ -109,8 +109,14 @@ $slider-bg-color: lighten($primary-background-color, 33%); } } - .vjs-play-progress .vjs-time-tooltip { - display: none; + .vjs-play-progress { + &::before:hover { + top: -0.372em; + } + + .vjs-time-tooltip { + display: none; + } } .vjs-load-progress { @@ -129,6 +135,28 @@ $slider-bg-color: lighten($primary-background-color, 33%); .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 + { + opacity: $primary-foreground-opacity; + transition: opacity .1s; + + &:hover { + opacity: $primary-foreground-opacity-hover; + } + } + + .vjs-current-time, + .vjs-duration, + .vjs-peertube { + color: $primary-foreground-color; + } + .vjs-progress-control { bottom: 34px; width: 100%; @@ -169,7 +197,6 @@ $slider-bg-color: lighten($primary-background-color, 33%); font-size: $font-size; display: inline-block; padding: 0; - .vjs-duration-display { line-height: calc(#{$control-bar-height} + 1px); }