OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix spinner

pull/200/head
Chocobozzz 2018-01-11 15:14:40 +01:00
parent 6120941f59
commit dfbd250da1
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/app/videos/+video-watch/video-watch.component.ts
View File

@ -32,7 +32,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
otherVideosDisplayed: Video[] = [] otherVideosDisplayed: Video[] = []
error = false error = false
loading = false
player: videojs.Player player: videojs.Player
playerElement: HTMLVideoElement playerElement: HTMLVideoElement
userRating: UserVideoRateType = null userRating: UserVideoRateType = null

36
client/src/sass/video-js-custom.scss
View File

@ -46,20 +46,6 @@ $control-bar-height: 34px;
transition: visibility 0.5s, opacity 0.5s; transition: visibility 0.5s, opacity 0.5s;
} }
.vjs-loading-spinner {
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;
}
.vjs-control-bar, .vjs-control-bar,
.vjs-big-play-button, .vjs-big-play-button,
.vjs-menu-button .vjs-menu-content { .vjs-menu-button .vjs-menu-content {
@ -374,8 +360,9 @@ $control-bar-height: 34px;
border: 0.7em solid rgba(255, 255, 255, 0.2); border: 0.7em solid rgba(255, 255, 255, 0.2);
border-left-color: #ffffff; border-left-color: #ffffff;
transform: translateZ(0); transform: translateZ(0);
animation: spinner 1.4s infinite linear; animation: 0.3s ease-out 0.3s forwards vjs-spinner-show, spinner 1.4s infinite linear !important;
overflow: hidden; overflow: hidden;
visibility: hidden;
&:before { &:before {
animation: none !important; animation: none !important;
@ -396,5 +383,24 @@ $control-bar-height: 34px;
transform: rotate(360deg); 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;
}
}
} }