From e91890011e100b677d35598e2feec7c6252e89bf Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 21 Dec 2017 10:49:52 +0100 Subject: Add tooltip to likes/dislikes bar --- client/src/sass/include/_bootstrap.scss | 2 +- client/src/sass/video-js-custom.scss | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'client/src/sass') diff --git a/client/src/sass/include/_bootstrap.scss b/client/src/sass/include/_bootstrap.scss index 4f0e2893e..bbf0fda22 100644 --- a/client/src/sass/include/_bootstrap.scss +++ b/client/src/sass/include/_bootstrap.scss @@ -41,7 +41,7 @@ // Components w/ JavaScript @import "~bootstrap-sass/assets/stylesheets/bootstrap/modals"; -//@import "~bootstrap-sass/assets/stylesheets/bootstrap/tooltip"; +@import "~bootstrap-sass/assets/stylesheets/bootstrap/tooltip"; //@import "~bootstrap-sass/assets/stylesheets/bootstrap/popovers"; //@import "~bootstrap-sass/assets/stylesheets/bootstrap/carousel"; diff --git a/client/src/sass/video-js-custom.scss b/client/src/sass/video-js-custom.scss index 724874995..715464ce8 100644 --- a/client/src/sass/video-js-custom.scss +++ b/client/src/sass/video-js-custom.scss @@ -50,12 +50,14 @@ $control-bar-height: 34px; display: block; visibility: hidden; opacity: 0; + transition-delay: 0.5s; + transition: visibility 0.5s, opacity 0.5s; } &.vjs-waiting .vjs-loading-spinner { visibility: visible; opacity: 1; - transition: visibility 0.5s, opacity 0.5s; + } .vjs-control-bar, -- cgit v1.2.3