diff options
author | Chocobozzz <me@florianbigard.com> | 2017-12-21 10:49:52 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2017-12-21 10:49:52 +0100 |
commit | e91890011e100b677d35598e2feec7c6252e89bf (patch) | |
tree | 868fc7edd71f72d19747acfd9fa383c22b5d7bd8 /client/src/sass | |
parent | 604abfbef5e80d94e46658e4efa762adeab855ea (diff) | |
download | PeerTube-e91890011e100b677d35598e2feec7c6252e89bf.tar.gz PeerTube-e91890011e100b677d35598e2feec7c6252e89bf.tar.zst PeerTube-e91890011e100b677d35598e2feec7c6252e89bf.zip |
Add tooltip to likes/dislikes bar
Diffstat (limited to 'client/src/sass')
-rw-r--r-- | client/src/sass/include/_bootstrap.scss | 2 | ||||
-rw-r--r-- | client/src/sass/video-js-custom.scss | 4 |
2 files changed, 4 insertions, 2 deletions
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 @@ | |||
41 | 41 | ||
42 | // Components w/ JavaScript | 42 | // Components w/ JavaScript |
43 | @import "~bootstrap-sass/assets/stylesheets/bootstrap/modals"; | 43 | @import "~bootstrap-sass/assets/stylesheets/bootstrap/modals"; |
44 | //@import "~bootstrap-sass/assets/stylesheets/bootstrap/tooltip"; | 44 | @import "~bootstrap-sass/assets/stylesheets/bootstrap/tooltip"; |
45 | //@import "~bootstrap-sass/assets/stylesheets/bootstrap/popovers"; | 45 | //@import "~bootstrap-sass/assets/stylesheets/bootstrap/popovers"; |
46 | //@import "~bootstrap-sass/assets/stylesheets/bootstrap/carousel"; | 46 | //@import "~bootstrap-sass/assets/stylesheets/bootstrap/carousel"; |
47 | 47 | ||
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; | |||
50 | display: block; | 50 | display: block; |
51 | visibility: hidden; | 51 | visibility: hidden; |
52 | opacity: 0; | 52 | opacity: 0; |
53 | transition-delay: 0.5s; | ||
54 | transition: visibility 0.5s, opacity 0.5s; | ||
53 | } | 55 | } |
54 | 56 | ||
55 | &.vjs-waiting .vjs-loading-spinner { | 57 | &.vjs-waiting .vjs-loading-spinner { |
56 | visibility: visible; | 58 | visibility: visible; |
57 | opacity: 1; | 59 | opacity: 1; |
58 | transition: visibility 0.5s, opacity 0.5s; | 60 | |
59 | } | 61 | } |
60 | 62 | ||
61 | .vjs-control-bar, | 63 | .vjs-control-bar, |