From 8021b893c8d71efe68d5338badec4352fc74aeb3 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Thu, 18 Jun 2020 19:43:32 +0300 Subject: [PATCH 01/18] Don't start time sync if not in SyncPlay mode --- src/components/syncPlay/timeSyncManager.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/syncPlay/timeSyncManager.js b/src/components/syncPlay/timeSyncManager.js index 6c151b368..d3b59589e 100644 --- a/src/components/syncPlay/timeSyncManager.js +++ b/src/components/syncPlay/timeSyncManager.js @@ -65,8 +65,6 @@ class TimeSyncManager { this.pings = 0; // number of pings this.measurement = null; // current time sync this.measurements = []; - - this.startPing(); } /** From 0e376bb78dbf73a2139ab5f8e52b9f307ab22b18 Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Sat, 2 May 2020 16:37:06 +0200 Subject: [PATCH 02/18] Enable a simple placeholder for cards --- src/components/cardbuilder/card.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css index c24fcf6ba..57be06315 100644 --- a/src/components/cardbuilder/card.css +++ b/src/components/cardbuilder/card.css @@ -215,7 +215,7 @@ button::-moz-focus-inner { } .cardContent-button:not(.defaultCardBackground) { - background-color: transparent; + background-color: #202020; } .visualCardBox .cardContent { From f80fb1bb278827d8ea059909ff16fe0f68a53fd9 Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Sat, 2 May 2020 17:34:06 +0200 Subject: [PATCH 03/18] Fix placeholder in TV layout --- src/components/cardbuilder/card.css | 22 ++++++++-------------- src/components/cardbuilder/cardBuilder.js | 1 - 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css index 57be06315..cc71bb845 100644 --- a/src/components/cardbuilder/card.css +++ b/src/components/cardbuilder/card.css @@ -192,9 +192,14 @@ button::-moz-focus-inner { /* Needed in case this is a button */ display: block; - - /* Needed in case this is a button */ margin: 0 !important; + border: 0 !important; + padding: 0 !important; + cursor: pointer; + color: inherit; + width: 100%; + font-family: inherit; + font-size: inherit; /* Needed in safari */ height: 100%; @@ -203,18 +208,7 @@ button::-moz-focus-inner { contain: strict; } -.cardContent-button { - border: 0 !important; - padding: 0 !important; - cursor: pointer; - color: inherit; - width: 100%; - vertical-align: middle; - font-family: inherit; - font-size: inherit; -} - -.cardContent-button:not(.defaultCardBackground) { +.cardContent:not(.defaultCardBackground) { background-color: #202020; } diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index 638c2335c..fb36b6758 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -1377,7 +1377,6 @@ import 'programStyles'; } if (layoutManager.tv) { - // Don't use the IMG tag with safari because it puts a white border around it cardImageContainerOpen = imgUrl ? ('
') : ('
'); From b088ae842845d2813c8b68484a4db1f9b72b5e85 Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Sat, 2 May 2020 19:27:40 +0200 Subject: [PATCH 04/18] Correct card color --- src/components/cardbuilder/card.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css index cc71bb845..dc11ae915 100644 --- a/src/components/cardbuilder/card.css +++ b/src/components/cardbuilder/card.css @@ -209,7 +209,7 @@ button::-moz-focus-inner { } .cardContent:not(.defaultCardBackground) { - background-color: #202020; + background-color: #242424; } .visualCardBox .cardContent { From 90c971afa99a530007d8add2f539843f11be61ce Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Sat, 2 May 2020 19:40:04 +0200 Subject: [PATCH 05/18] Add theme colors for card placeholders --- src/components/cardbuilder/card.css | 4 ++++ src/themes/appletv/theme.css | 4 ++-- src/themes/blueradiance/theme.css | 4 ++++ src/themes/dark/theme.css | 3 +-- src/themes/light/theme.css | 4 ++++ src/themes/purplehaze/theme.css | 4 ++++ src/themes/wmc/theme.css | 4 ++++ 7 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css index dc11ae915..94e6d8d97 100644 --- a/src/components/cardbuilder/card.css +++ b/src/components/cardbuilder/card.css @@ -212,6 +212,10 @@ button::-moz-focus-inner { background-color: #242424; } +.backdropCard .cardContent:not(.defaultCardBackground) { + background-color: transparent; +} + .visualCardBox .cardContent { border-bottom-left-radius: 0; border-bottom-right-radius: 0; diff --git a/src/themes/appletv/theme.css b/src/themes/appletv/theme.css index b3ce2c7e9..90de1d003 100644 --- a/src/themes/appletv/theme.css +++ b/src/themes/appletv/theme.css @@ -122,8 +122,8 @@ html { } .paperList, -.visualCardBox { - background-color: #fff; +.visualCardBox, +.cardContent:not(.defaultCardBackground) { background-color: rgba(0, 0, 0, 0.1); } diff --git a/src/themes/blueradiance/theme.css b/src/themes/blueradiance/theme.css index 74a60c91c..1d6ab8890 100644 --- a/src/themes/blueradiance/theme.css +++ b/src/themes/blueradiance/theme.css @@ -450,6 +450,10 @@ html { color: #4285f4; } +.cardContent:not(.defaultCardBackground) { + background-color: rgba(0, 0, 0, 0.5); +} + .card:focus .cardBox.visualCardBox, .card:focus .cardBox:not(.visualCardBox) .cardScalable { border-color: #00a4dc !important; diff --git a/src/themes/dark/theme.css b/src/themes/dark/theme.css index a32e60638..d4a3335b8 100644 --- a/src/themes/dark/theme.css +++ b/src/themes/dark/theme.css @@ -421,8 +421,7 @@ html { color: #4285f4; } -.card:focus .cardBox.visualCardBox, -.card:focus .cardBox:not(.visualCardBox) .cardScalable { +.card:focus .cardBox.visualCardBox { border-color: #00a4dc !important; } diff --git a/src/themes/light/theme.css b/src/themes/light/theme.css index 114ef7c3b..fd3f8e5da 100644 --- a/src/themes/light/theme.css +++ b/src/themes/light/theme.css @@ -432,6 +432,10 @@ html { color: #4285f4; } +.cardContent:not(.defaultCardBackground) { + background-color: #fff; +} + .card:focus .cardBox.visualCardBox, .card:focus .cardBox:not(.visualCardBox) .cardScalable { border-color: #00a4dc !important; diff --git a/src/themes/purplehaze/theme.css b/src/themes/purplehaze/theme.css index de69a5542..d2f9d92eb 100644 --- a/src/themes/purplehaze/theme.css +++ b/src/themes/purplehaze/theme.css @@ -552,6 +552,10 @@ a[data-role=button] { border: 1px solid rgb(255, 255, 255); } +.cardContent:not(.defaultCardBackground) { + background-color: rgba(0, 0, 0, 0.5); +} + .card:focus .cardBox.visualCardBox, .card:focus .cardBox:not(.visualCardBox) .cardScalable { border-color: #ff77f1 !important; diff --git a/src/themes/wmc/theme.css b/src/themes/wmc/theme.css index e7d4c0371..76342f79f 100644 --- a/src/themes/wmc/theme.css +++ b/src/themes/wmc/theme.css @@ -430,6 +430,10 @@ html { color: #4285f4; } +.cardContent:not(.defaultCardBackground) { + background-color: #0f3562; +} + .card:focus .cardBox.visualCardBox, .card:focus .cardBox:not(.visualCardBox) .cardScalable { border-color: #fff !important; From c42f93195360ac13e114ee3b42ae0dd0feb8f68f Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Sat, 2 May 2020 19:51:34 +0200 Subject: [PATCH 06/18] Fix linting issue --- src/components/cardbuilder/card.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css index 94e6d8d97..98e231627 100644 --- a/src/components/cardbuilder/card.css +++ b/src/components/cardbuilder/card.css @@ -212,15 +212,15 @@ button::-moz-focus-inner { background-color: #242424; } -.backdropCard .cardContent:not(.defaultCardBackground) { - background-color: transparent; -} - .visualCardBox .cardContent { border-bottom-left-radius: 0; border-bottom-right-radius: 0; } +.backdropCard .cardContent:not(.defaultCardBackground) { + background-color: transparent; +} + .cardContent-shadow { box-shadow: 0 0.0725em 0.29em 0 rgba(0, 0, 0, 0.37); } From d804b4097a4d144ac5fd1027aedd09e9b3067a18 Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Sat, 2 May 2020 20:58:36 +0200 Subject: [PATCH 07/18] Re-add accidentally removed code --- src/themes/dark/theme.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/themes/dark/theme.css b/src/themes/dark/theme.css index d4a3335b8..a32e60638 100644 --- a/src/themes/dark/theme.css +++ b/src/themes/dark/theme.css @@ -421,7 +421,8 @@ html { color: #4285f4; } -.card:focus .cardBox.visualCardBox { +.card:focus .cardBox.visualCardBox, +.card:focus .cardBox:not(.visualCardBox) .cardScalable { border-color: #00a4dc !important; } From d91797b06ecb9bded1572722943f19a3aa1faf70 Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Sun, 31 May 2020 23:48:57 +0200 Subject: [PATCH 08/18] Reword the placeholder --- src/components/cardbuilder/card.css | 4 ---- src/components/images/style.css | 4 ++-- src/themes/appletv/theme.css | 15 +++++++++++++++ src/themes/blueradiance/theme.css | 15 +++++++++++++++ src/themes/dark/theme.css | 15 +++++++++++++++ src/themes/light/theme.css | 15 +++++++++++++++ src/themes/purplehaze/theme.css | 15 +++++++++++++++ src/themes/wmc/theme.css | 15 +++++++++++++++ 8 files changed, 92 insertions(+), 6 deletions(-) diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css index 98e231627..dc11ae915 100644 --- a/src/components/cardbuilder/card.css +++ b/src/components/cardbuilder/card.css @@ -217,10 +217,6 @@ button::-moz-focus-inner { border-bottom-right-radius: 0; } -.backdropCard .cardContent:not(.defaultCardBackground) { - background-color: transparent; -} - .cardContent-shadow { box-shadow: 0 0.0725em 0.29em 0 rgba(0, 0, 0, 0.37); } diff --git a/src/components/images/style.css b/src/components/images/style.css index a20d242ef..2b09da2da 100644 --- a/src/components/images/style.css +++ b/src/components/images/style.css @@ -1,11 +1,11 @@ .lazy-image-fadein { opacity: 1; - transition: opacity 0.7s; + transition: opacity 0.5s; } .lazy-image-fadein-fast { opacity: 1; - transition: opacity 0.2s; + transition: opacity 0.1s; } .lazy-hidden { diff --git a/src/themes/appletv/theme.css b/src/themes/appletv/theme.css index 90de1d003..4b1c91c14 100644 --- a/src/themes/appletv/theme.css +++ b/src/themes/appletv/theme.css @@ -464,3 +464,18 @@ html { .metadataSidebarIcon { color: #00a4dc; } + +.cardPadder-square, +.cardPadder-mixedSquare, +.cardPadder-overflowSquare, +.cardPadder-portrait, +.cardPadder-mixedPortrait, +.cardPadder-overflowPortrait, +.cardPadder-banner, +.cardPadder-backdrop, +.cardPadder-mixedBackdrop, +.cardPadder-smallBackdrop, +.cardPadder-overflowBackdrop, +.cardPadder-overflowSmallBackdrop { + background-color: #d2d2d2; +} diff --git a/src/themes/blueradiance/theme.css b/src/themes/blueradiance/theme.css index 1d6ab8890..5c1e9ae09 100644 --- a/src/themes/blueradiance/theme.css +++ b/src/themes/blueradiance/theme.css @@ -487,3 +487,18 @@ html { .metadataSidebarIcon { color: #00a4dc; } + +.cardPadder-square, +.cardPadder-mixedSquare, +.cardPadder-overflowSquare, +.cardPadder-portrait, +.cardPadder-mixedPortrait, +.cardPadder-overflowPortrait, +.cardPadder-banner, +.cardPadder-backdrop, +.cardPadder-mixedBackdrop, +.cardPadder-smallBackdrop, +.cardPadder-overflowBackdrop, +.cardPadder-overflowSmallBackdrop { + background-color: #022950; +} diff --git a/src/themes/dark/theme.css b/src/themes/dark/theme.css index a32e60638..8ef6a39be 100644 --- a/src/themes/dark/theme.css +++ b/src/themes/dark/theme.css @@ -453,3 +453,18 @@ html { .metadataSidebarIcon { color: #00a4dc; } + +.cardPadder-square, +.cardPadder-mixedSquare, +.cardPadder-overflowSquare, +.cardPadder-portrait, +.cardPadder-mixedPortrait, +.cardPadder-overflowPortrait, +.cardPadder-banner, +.cardPadder-backdrop, +.cardPadder-mixedBackdrop, +.cardPadder-smallBackdrop, +.cardPadder-overflowBackdrop, +.cardPadder-overflowSmallBackdrop { + background-color: #202020; +} diff --git a/src/themes/light/theme.css b/src/themes/light/theme.css index fd3f8e5da..14c7d5f4a 100644 --- a/src/themes/light/theme.css +++ b/src/themes/light/theme.css @@ -444,3 +444,18 @@ html { .metadataSidebarIcon { color: #00a4dc; } + +.cardPadder-square, +.cardPadder-mixedSquare, +.cardPadder-overflowSquare, +.cardPadder-portrait, +.cardPadder-mixedPortrait, +.cardPadder-overflowPortrait, +.cardPadder-banner, +.cardPadder-backdrop, +.cardPadder-mixedBackdrop, +.cardPadder-smallBackdrop, +.cardPadder-overflowBackdrop, +.cardPadder-overflowSmallBackdrop { + background-color: #fff; +} diff --git a/src/themes/purplehaze/theme.css b/src/themes/purplehaze/theme.css index d2f9d92eb..194142c35 100644 --- a/src/themes/purplehaze/theme.css +++ b/src/themes/purplehaze/theme.css @@ -623,3 +623,18 @@ a[data-role=button] { .personCard .cardOverlayButton-br { right: 20%; } + +.cardPadder-square, +.cardPadder-mixedSquare, +.cardPadder-overflowSquare, +.cardPadder-portrait, +.cardPadder-mixedPortrait, +.cardPadder-overflowPortrait, +.cardPadder-banner, +.cardPadder-backdrop, +.cardPadder-mixedBackdrop, +.cardPadder-smallBackdrop, +.cardPadder-overflowBackdrop, +.cardPadder-overflowSmallBackdrop { + background-color: #200c3d; +} diff --git a/src/themes/wmc/theme.css b/src/themes/wmc/theme.css index 76342f79f..0e2ff6f5a 100644 --- a/src/themes/wmc/theme.css +++ b/src/themes/wmc/theme.css @@ -463,3 +463,18 @@ html { .metadataSidebarIcon { color: #00a4dc; } + +.cardPadder-square, +.cardPadder-mixedSquare, +.cardPadder-overflowSquare, +.cardPadder-portrait, +.cardPadder-mixedPortrait, +.cardPadder-overflowPortrait, +.cardPadder-banner, +.cardPadder-backdrop, +.cardPadder-mixedBackdrop, +.cardPadder-smallBackdrop, +.cardPadder-overflowBackdrop, +.cardPadder-overflowSmallBackdrop { + background-color: #0f3562; +} From f3fbc545a14225210b7ec316f317b9ca29e14edf Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Sun, 31 May 2020 23:52:25 +0200 Subject: [PATCH 09/18] Fix stylelint error --- src/themes/purplehaze/theme.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/themes/purplehaze/theme.css b/src/themes/purplehaze/theme.css index 194142c35..79f31d6ba 100644 --- a/src/themes/purplehaze/theme.css +++ b/src/themes/purplehaze/theme.css @@ -606,12 +606,6 @@ a[data-role=button] { width: 40vw; } -.personCard .cardPadder-overflowPortrait, -.personCard .cardPadder-portrait { - padding-bottom: 100%; - contain: strict; -} - .personCard .coveredImage { clip-path: circle(50% at 50% 50%); } @@ -638,3 +632,9 @@ a[data-role=button] { .cardPadder-overflowSmallBackdrop { background-color: #200c3d; } + +.personCard .cardPadder-overflowPortrait, +.personCard .cardPadder-portrait { + padding-bottom: 100%; + contain: strict; +} From 8ecaf85dbaca7913abd93d7650f0183106c082ef Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Sun, 21 Jun 2020 17:04:08 +0200 Subject: [PATCH 10/18] Fix placeholders on purplehaze Co-authored-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com> --- src/components/cardbuilder/card.css | 7 +++++- src/components/cardbuilder/cardBuilder.js | 5 +---- src/themes/appletv/theme.css | 17 +-------------- src/themes/blueradiance/theme.css | 17 +-------------- src/themes/dark/theme.css | 15 ------------- src/themes/light/theme.css | 17 +-------------- src/themes/purplehaze/theme.css | 26 ++++++++--------------- src/themes/wmc/theme.css | 17 +-------------- 8 files changed, 20 insertions(+), 101 deletions(-) diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css index dc11ae915..d77fe5660 100644 --- a/src/components/cardbuilder/card.css +++ b/src/components/cardbuilder/card.css @@ -209,6 +209,10 @@ button::-moz-focus-inner { } .cardContent:not(.defaultCardBackground) { + background-color: transparent; +} + +.cardBox:not(.visualCardBox) .cardPadder { background-color: #242424; } @@ -217,7 +221,8 @@ button::-moz-focus-inner { border-bottom-right-radius: 0; } -.cardContent-shadow { +.cardContent-shadow, +.cardBox:not(.visualCardBox) .cardPadder { box-shadow: 0 0.0725em 0.29em 0 rgba(0, 0, 0, 0.37); } diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index fb36b6758..2fa1fba06 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -1367,9 +1367,6 @@ import 'programStyles'; let cardScalableClose = ''; let cardContentClass = 'cardContent'; - if (!options.cardLayout) { - cardContentClass += ' cardContent-shadow'; - } let blurhashAttrib = ''; if (blurhash && blurhash.length > 0) { @@ -1390,7 +1387,7 @@ import 'programStyles'; let cardScalableClass = 'cardScalable'; - cardImageContainerOpen = '
' + cardImageContainerOpen; + cardImageContainerOpen = '
' + cardImageContainerOpen; cardBoxClose = '
'; cardScalableClose = '
'; diff --git a/src/themes/appletv/theme.css b/src/themes/appletv/theme.css index 4b1c91c14..cd0ac8680 100644 --- a/src/themes/appletv/theme.css +++ b/src/themes/appletv/theme.css @@ -123,7 +123,7 @@ html { .paperList, .visualCardBox, -.cardContent:not(.defaultCardBackground) { +.cardBox:not(.visualCardBox) .cardPadder { background-color: rgba(0, 0, 0, 0.1); } @@ -464,18 +464,3 @@ html { .metadataSidebarIcon { color: #00a4dc; } - -.cardPadder-square, -.cardPadder-mixedSquare, -.cardPadder-overflowSquare, -.cardPadder-portrait, -.cardPadder-mixedPortrait, -.cardPadder-overflowPortrait, -.cardPadder-banner, -.cardPadder-backdrop, -.cardPadder-mixedBackdrop, -.cardPadder-smallBackdrop, -.cardPadder-overflowBackdrop, -.cardPadder-overflowSmallBackdrop { - background-color: #d2d2d2; -} diff --git a/src/themes/blueradiance/theme.css b/src/themes/blueradiance/theme.css index 5c1e9ae09..08ab576aa 100644 --- a/src/themes/blueradiance/theme.css +++ b/src/themes/blueradiance/theme.css @@ -450,7 +450,7 @@ html { color: #4285f4; } -.cardContent:not(.defaultCardBackground) { +.cardBox:not(.visualCardBox) .cardPadder { background-color: rgba(0, 0, 0, 0.5); } @@ -487,18 +487,3 @@ html { .metadataSidebarIcon { color: #00a4dc; } - -.cardPadder-square, -.cardPadder-mixedSquare, -.cardPadder-overflowSquare, -.cardPadder-portrait, -.cardPadder-mixedPortrait, -.cardPadder-overflowPortrait, -.cardPadder-banner, -.cardPadder-backdrop, -.cardPadder-mixedBackdrop, -.cardPadder-smallBackdrop, -.cardPadder-overflowBackdrop, -.cardPadder-overflowSmallBackdrop { - background-color: #022950; -} diff --git a/src/themes/dark/theme.css b/src/themes/dark/theme.css index 8ef6a39be..a32e60638 100644 --- a/src/themes/dark/theme.css +++ b/src/themes/dark/theme.css @@ -453,18 +453,3 @@ html { .metadataSidebarIcon { color: #00a4dc; } - -.cardPadder-square, -.cardPadder-mixedSquare, -.cardPadder-overflowSquare, -.cardPadder-portrait, -.cardPadder-mixedPortrait, -.cardPadder-overflowPortrait, -.cardPadder-banner, -.cardPadder-backdrop, -.cardPadder-mixedBackdrop, -.cardPadder-smallBackdrop, -.cardPadder-overflowBackdrop, -.cardPadder-overflowSmallBackdrop { - background-color: #202020; -} diff --git a/src/themes/light/theme.css b/src/themes/light/theme.css index 14c7d5f4a..acea3f1d6 100644 --- a/src/themes/light/theme.css +++ b/src/themes/light/theme.css @@ -432,7 +432,7 @@ html { color: #4285f4; } -.cardContent:not(.defaultCardBackground) { +.cardBox:not(.visualCardBox) .cardPadder { background-color: #fff; } @@ -444,18 +444,3 @@ html { .metadataSidebarIcon { color: #00a4dc; } - -.cardPadder-square, -.cardPadder-mixedSquare, -.cardPadder-overflowSquare, -.cardPadder-portrait, -.cardPadder-mixedPortrait, -.cardPadder-overflowPortrait, -.cardPadder-banner, -.cardPadder-backdrop, -.cardPadder-mixedBackdrop, -.cardPadder-smallBackdrop, -.cardPadder-overflowBackdrop, -.cardPadder-overflowSmallBackdrop { - background-color: #fff; -} diff --git a/src/themes/purplehaze/theme.css b/src/themes/purplehaze/theme.css index 79f31d6ba..a311fd310 100644 --- a/src/themes/purplehaze/theme.css +++ b/src/themes/purplehaze/theme.css @@ -548,12 +548,13 @@ a[data-role=button] { } .personCard .cardScalable { - border-radius: 50%; + border-radius: 50% !important; border: 1px solid rgb(255, 255, 255); } -.cardContent:not(.defaultCardBackground) { +.cardBox:not(.visualCardBox) .cardPadder { background-color: rgba(0, 0, 0, 0.5); + border-radius: 1em; } .card:focus .cardBox.visualCardBox, @@ -561,6 +562,11 @@ a[data-role=button] { border-color: #ff77f1 !important; } +.card.show-focus:not(.show-animation) .cardBox.visualCardBox, +.card.show-focus:not(.show-animation) .cardBox:not(.visualCardBox) .cardScalable { + border-radius: 1.5em; +} + .layout-desktop, .scrollY { scrollbar-width: thin; @@ -618,23 +624,9 @@ a[data-role=button] { right: 20%; } -.cardPadder-square, -.cardPadder-mixedSquare, -.cardPadder-overflowSquare, -.cardPadder-portrait, -.cardPadder-mixedPortrait, -.cardPadder-overflowPortrait, -.cardPadder-banner, -.cardPadder-backdrop, -.cardPadder-mixedBackdrop, -.cardPadder-smallBackdrop, -.cardPadder-overflowBackdrop, -.cardPadder-overflowSmallBackdrop { - background-color: #200c3d; -} - .personCard .cardPadder-overflowPortrait, .personCard .cardPadder-portrait { padding-bottom: 100%; contain: strict; + border-radius: 50% !important; } diff --git a/src/themes/wmc/theme.css b/src/themes/wmc/theme.css index 0e2ff6f5a..97c08caf8 100644 --- a/src/themes/wmc/theme.css +++ b/src/themes/wmc/theme.css @@ -430,7 +430,7 @@ html { color: #4285f4; } -.cardContent:not(.defaultCardBackground) { +.cardBox:not(.visualCardBox) .cardPadder { background-color: #0f3562; } @@ -463,18 +463,3 @@ html { .metadataSidebarIcon { color: #00a4dc; } - -.cardPadder-square, -.cardPadder-mixedSquare, -.cardPadder-overflowSquare, -.cardPadder-portrait, -.cardPadder-mixedPortrait, -.cardPadder-overflowPortrait, -.cardPadder-banner, -.cardPadder-backdrop, -.cardPadder-mixedBackdrop, -.cardPadder-smallBackdrop, -.cardPadder-overflowBackdrop, -.cardPadder-overflowSmallBackdrop { - background-color: #0f3562; -} From b2ffc1109a9ee2b7385d4c1e9297ef704d9f65b2 Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Sun, 21 Jun 2020 17:09:42 +0200 Subject: [PATCH 11/18] Remove leftover references to cardContent-button --- src/components/cardbuilder/cardBuilder.js | 2 +- src/components/remotecontrol/remotecontrol.js | 2 +- src/themes/appletv/theme.css | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index 2fa1fba06..52d5ed202 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -1380,7 +1380,7 @@ import 'programStyles'; cardImageContainerClose = '
'; } else { // Don't use the IMG tag with safari because it puts a white border around it - cardImageContainerOpen = imgUrl ? (''; } diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js index 089915a83..b1d747133 100644 --- a/src/components/remotecontrol/remotecontrol.js +++ b/src/components/remotecontrol/remotecontrol.js @@ -196,7 +196,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL context.querySelector('.nowPlayingPageImage').classList.remove('nowPlayingPageImageAudio'); } } else { - imgContainer.innerHTML = '
'; + imgContainer.innerHTML = '
'; } } diff --git a/src/themes/appletv/theme.css b/src/themes/appletv/theme.css index cd0ac8680..bf6f6c2a5 100644 --- a/src/themes/appletv/theme.css +++ b/src/themes/appletv/theme.css @@ -455,7 +455,6 @@ html { border-color: #00a4dc !important; } -.cardContent-button, .itemDetailImage, .cardOverlayContainer { border-radius: 0.5rem; From 1042121668d82faf51db155a0796f1d2ba9d8a6f Mon Sep 17 00:00:00 2001 From: KGT1 Date: Mon, 22 Jun 2020 09:47:02 +0200 Subject: [PATCH 12/18] added ActionHandler seekto for Notification-Bar --- src/components/playback/mediasession.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/components/playback/mediasession.js b/src/components/playback/mediasession.js index 5eac56b5c..d42f72527 100644 --- a/src/components/playback/mediasession.js +++ b/src/components/playback/mediasession.js @@ -241,6 +241,15 @@ import connectionManager from 'connectionManager'; navigator.mediaSession.setActionHandler('seekforward', function () { execute('fastForward'); }); + + /* eslint-disable-next-line compat/compat */ + navigator.mediaSession.setActionHandler('seekto', function (object) { + let item = playbackManager.getPlayerState(playbackManager.getCurrentPlayer()).NowPlayingItem; + // Convert to ms + let duration = parseInt(item.RunTimeTicks ? (item.RunTimeTicks / 10000) : 0); + let wantedTime = object.seekTime*1000; + playbackManager.seekPercent(wantedTime/duration*100,currentPlayer); + }); } events.on(playbackManager, 'playerchange', function () { From 329af3f54dd13d604f830fe2c89e13c85dc82978 Mon Sep 17 00:00:00 2001 From: KGT1 Date: Mon, 22 Jun 2020 10:08:54 +0200 Subject: [PATCH 13/18] fixed linting errors --- src/components/playback/mediasession.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/playback/mediasession.js b/src/components/playback/mediasession.js index d42f72527..f31333fde 100644 --- a/src/components/playback/mediasession.js +++ b/src/components/playback/mediasession.js @@ -247,8 +247,8 @@ import connectionManager from 'connectionManager'; let item = playbackManager.getPlayerState(playbackManager.getCurrentPlayer()).NowPlayingItem; // Convert to ms let duration = parseInt(item.RunTimeTicks ? (item.RunTimeTicks / 10000) : 0); - let wantedTime = object.seekTime*1000; - playbackManager.seekPercent(wantedTime/duration*100,currentPlayer); + let wantedTime = object.seekTime * 1000; + playbackManager.seekPercent(wantedTime / duration * 100, currentPlayer); }); } From c639b12f9eea044160e36fa3689cba3bb72e0d7d Mon Sep 17 00:00:00 2001 From: KGT1 Date: Mon, 22 Jun 2020 18:01:20 +0200 Subject: [PATCH 14/18] Update mediasession.js changed playbackManager.getCurrentPlayer() to currentPlayer --- src/components/playback/mediasession.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/playback/mediasession.js b/src/components/playback/mediasession.js index f31333fde..0f275c88f 100644 --- a/src/components/playback/mediasession.js +++ b/src/components/playback/mediasession.js @@ -244,7 +244,7 @@ import connectionManager from 'connectionManager'; /* eslint-disable-next-line compat/compat */ navigator.mediaSession.setActionHandler('seekto', function (object) { - let item = playbackManager.getPlayerState(playbackManager.getCurrentPlayer()).NowPlayingItem; + let item = playbackManager.getPlayerState(currentPlayer).NowPlayingItem; // Convert to ms let duration = parseInt(item.RunTimeTicks ? (item.RunTimeTicks / 10000) : 0); let wantedTime = object.seekTime * 1000; From f0afb359f0ff9766cec526234883e2afdb9270c7 Mon Sep 17 00:00:00 2001 From: Dovry Date: Mon, 22 Jun 2020 17:01:43 +0000 Subject: [PATCH 15/18] Translated using Weblate (Icelandic) Translation: Jellyfin/Jellyfin Web Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-web/is/ --- src/strings/is-is.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/strings/is-is.json b/src/strings/is-is.json index 1042737ae..f0d39a1d0 100644 --- a/src/strings/is-is.json +++ b/src/strings/is-is.json @@ -543,5 +543,9 @@ "LabelAllowServerAutoRestart": "Leyfa netþjóni að endurræsa sig sjálfkrafa til þess að uppfæra sig", "LabelAllowHWTranscoding": "Leyfa vélbúnaðarumkóðun", "Label3DFormat": "3D snið:", - "HeaderIdentification": "Auðkenning" + "HeaderIdentification": "Auðkenning", + "ConfirmDeleteItems": "Ef þessum skrám er eytt verða þær fjarlægðar úr bæði stýrikerfinu og miðlasafninu. Ertu viss um að þú viljir halda áfram?", + "CommunityRating": "Mat samfélagsins", + "ButtonStart": "Byrja", + "BoxSet": "Kassasett" } From 6f9457c7137b9a97c4a3a143e3d5fe6e3ab5dd17 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Mon, 22 Jun 2020 23:02:04 +0300 Subject: [PATCH 16/18] Hide hamburger button on TV --- src/scripts/libraryMenu.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js index 1a0628ac1..a05553044 100644 --- a/src/scripts/libraryMenu.js +++ b/src/scripts/libraryMenu.js @@ -834,6 +834,7 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', ' var headerAudioPlayerButton; var headerSyncButton; var enableLibraryNavDrawer = layoutManager.desktop; + var enableLibraryNavDrawerHome = !layoutManager.tv; var skinHeader = document.querySelector('.skinHeader'); var requiresUserRefresh = true; var lastOpenTime = new Date().getTime(); @@ -920,7 +921,7 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', ' refreshDashboardInfoInDrawer(apiClient); } else { if (mainDrawerButton) { - if (enableLibraryNavDrawer || isHomePage) { + if (enableLibraryNavDrawer || (isHomePage && enableLibraryNavDrawerHome)) { mainDrawerButton.classList.remove('hide'); } else { mainDrawerButton.classList.add('hide'); From 3870a9fb66c36ed2a0a94dcbfc7a4535372183fc Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 23 Jun 2020 11:52:33 +0000 Subject: [PATCH 17/18] Translated using Weblate (German) Translation: Jellyfin/Jellyfin Web Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-web/de/ --- src/strings/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/strings/de.json b/src/strings/de.json index 6e5d4cb18..23d311bbf 100644 --- a/src/strings/de.json +++ b/src/strings/de.json @@ -1573,7 +1573,7 @@ "EnableBlurhashHelp": "Bilder, die noch nicht fertig geladen wurden, werden mit einem verschwommenen Platzhalter dargestellt", "EnableBlurhash": "Verschwommene Platzhalter für Bilder erlauben", "EnableFasterAnimations": "Schnellere Animationen", - "EnableDecodingColorDepth10Vp9": "Aktiviere 10-Bit-Hardware-Dekodierung für Vp9", + "EnableDecodingColorDepth10Vp9": "Aktiviere 10-Bit-Hardware-Dekodierung für VP9", "EnableDecodingColorDepth10Hevc": "Aktiviere 10-Bit-Hardware-Dekodierung für HEVC", "MessageNoGenresAvailable": "Aktiviere einige Metadaten-Anbieter um Genres aus dem Internet zu holen.", "EnableFasterAnimationsHelp": "Benutze schnellere Animationen und Übergänge", From 668c18cd35bd352fa1524f111f16da2936fbc0a0 Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 23 Jun 2020 11:57:08 +0000 Subject: [PATCH 18/18] Translated using Weblate (German) Translation: Jellyfin/Jellyfin Web Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-web/de/ --- src/strings/de.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/strings/de.json b/src/strings/de.json index 23d311bbf..2318cf810 100644 --- a/src/strings/de.json +++ b/src/strings/de.json @@ -1578,5 +1578,13 @@ "MessageNoGenresAvailable": "Aktiviere einige Metadaten-Anbieter um Genres aus dem Internet zu holen.", "EnableFasterAnimationsHelp": "Benutze schnellere Animationen und Übergänge", "ButtonCast": "Besetzung", - "ButtonSyncPlay": "SyncPlay" + "ButtonSyncPlay": "SyncPlay", + "TabRepositories": "Repositories", + "MessageAddRepository": "Wenn Sie ein Repository hinzufügen möchten, klicken Sie auf die Schaltfläche neben der Kopfzeile und füllen Sie die angeforderten Informationen aus.", + "LabelRepositoryUrlHelp": "Der Speicherort des Repository-Manifests, das Sie aufnehmen möchten.", + "LabelRepositoryNameHelp": "Ein benutzerdefinierter Name zur Unterscheidung dieses Repositorys von den anderen, die zu Ihrem Server hinzugefügt wurden.", + "LabelRepositoryName": "Name des Repository", + "LabelRepositoryUrl": "URL des Repository", + "HeaderNewRepository": "Neues Repository", + "MessageNoRepositories": "Keine Repositories." }