Merge remote-tracking branch 'upstream/master' into focus-fixes

2020-08-30 18:19:08 +02:00 · 2020-08-30 18:19:08 +02:00 · ca4419da4d
commit ca4419da4d
parent 9e4e8a911f 6045a026c7
26 changed files with 2146 additions and 1996 deletions
--- a/src/assets/css/videoosd.css
+++ b/src/assets/css/videoosd.css
@ -248,8 +248,6 @@
 }

@media all and (max-width: 30em) {
-    .btnFastForward,
-    .btnRewind,
    .osdMediaInfo,
    .osdPoster {
        display: none !important;