Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
* upstream/master:
  Add 'playlistThumbnail' to playlist objects
  Use accurate sub count when available
  Refactor search extractor
  Fix allowed_regions for globally blocked videos
  js: add support to detect alt, meta and control key in keydown handler (iv-org#704)
  Fix playlist_thumbnail extractor
  js: add support for keydown events (iv-org#678)
  Change font family to better native selection (iv-org#679)
  Fix season playlists
  Add prefers-color-scheme support (iv-org#601)
  • Loading branch information
greentornado committed Aug 22, 2019
2 parents 0bdc8a9 + 059f50d commit 1203044
Show file tree
Hide file tree
Showing 38 changed files with 683 additions and 360 deletions.
16 changes: 11 additions & 5 deletions assets/css/default.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
html,
body {
font-family: BlinkMacSystemFont, -apple-system, "Segoe UI", Roboto, Oxygen,
Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", Helvetica,
Arial, sans-serif;
}

.deleted {
background-color: rgb(255, 0, 0, 0.5);
}
Expand Down Expand Up @@ -103,6 +110,7 @@ img.thumbnail {
height: 100%;
left: 0;
top: 0;
object-fit: cover;
}

.length {
Expand All @@ -113,7 +121,6 @@ img.thumbnail {
border-radius: 2px;
padding: 2px;
font-size: 16px;
font-family: sans-serif;
right: 0.25em;
bottom: -0.75em;
}
Expand All @@ -126,7 +133,6 @@ img.thumbnail {
border-radius: 2px;
padding: 4px 8px 4px 8px;
font-size: 16px;
font-family: sans-serif;
left: 0.2em;
top: -0.7em;
}
Expand Down Expand Up @@ -439,8 +445,8 @@ video.video-js {
}

.video-js.player-style-youtube .vjs-control-bar {
display: flex;
flex-direction: row;
display: flex;
flex-direction: row;
}
.video-js.player-style-youtube .vjs-big-play-button {
/*
Expand All @@ -449,6 +455,6 @@ video.video-js {
*/
top: 50%;
left: 50%;
margin-top: -.81666em;
margin-top: -0.81666em;
margin-left: -1.5em;
}
Loading

0 comments on commit 1203044

Please sign in to comment.