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

Merge branch 'release/2.1.0' into develop

This commit is contained in:
Chocobozzz 2020-02-26 15:26:02 +01:00
parent 4832e41584 c002261381
commit 818c449b3c
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/app/menu/menu.component.scss
View File

@ -255,17 +255,13 @@ menu {
@media screen and (max-width: $mobile-view) { @media screen and (max-width: $mobile-view) {
.menu-wrapper { .menu-wrapper {
width: 100% !important; width: 100% !important;
menu {
overflow-y: auto;
}
} }
.top-menu, .footer { .top-menu, .footer {
width: 100% !important; width: 100% !important;
} }
} }
@media (hover: none) and (pointer: coarse) {
.menu-wrapper {
menu {
overflow-y: auto;
}
}
}

3
client/src/standalone/videos/embed.ts
View File

@ -263,6 +263,9 @@ export class PeerTubeEmbed {
private async buildDock (videoInfo: VideoDetails, configResponse: Response) { private async buildDock (videoInfo: VideoDetails, configResponse: Response) {
if (!this.controls) return if (!this.controls) return
// On webtorrent fallback, player may have been disposed
if (!this.player.player_) return
const title = this.title ? videoInfo.name : undefined const title = this.title ? videoInfo.name : undefined
const config: ServerConfig = await configResponse.json() const config: ServerConfig = await configResponse.json()