From 31ea2c18e5db2b5d98ccec6ac539fd99320bad1e Mon Sep 17 00:00:00 2001 From: dkanada Date: Tue, 2 Mar 2021 02:03:30 +0900 Subject: [PATCH 1/9] add border radius to active devices on dashboard --- src/assets/css/dashboard.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assets/css/dashboard.css b/src/assets/css/dashboard.css index efa0c0920..d7fcfa69e 100644 --- a/src/assets/css/dashboard.css +++ b/src/assets/css/dashboard.css @@ -214,6 +214,7 @@ div[data-role=controlgroup] a.ui-btn-active { background-repeat: no-repeat; background-position: center center; position: absolute; + border-radius: 2px; top: 0; left: 0; right: 0; From 1e8727952272b3020ca6a4b45d3b044bb0ae41a2 Mon Sep 17 00:00:00 2001 From: dkanada Date: Tue, 2 Mar 2021 02:06:38 +0900 Subject: [PATCH 2/9] add radius to library cards with images --- src/components/cardbuilder/card.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css index 69a0e4e90..01ac685cf 100644 --- a/src/components/cardbuilder/card.css +++ b/src/components/cardbuilder/card.css @@ -160,6 +160,7 @@ button::-moz-focus-inner { background-size: cover; background-repeat: no-repeat; background-position: center center; + border-radius: 2px; display: flex; align-items: center; justify-content: center; From ab72e13f85f397e9561718f520edc33b4f0965e4 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sat, 20 Mar 2021 02:11:44 +0900 Subject: [PATCH 3/9] add some code suggestions --- src/assets/css/dashboard.css | 3 +-- src/components/cardbuilder/card.css | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/assets/css/dashboard.css b/src/assets/css/dashboard.css index d7fcfa69e..e9e8d4f2e 100644 --- a/src/assets/css/dashboard.css +++ b/src/assets/css/dashboard.css @@ -214,7 +214,7 @@ div[data-role=controlgroup] a.ui-btn-active { background-repeat: no-repeat; background-position: center center; position: absolute; - border-radius: 2px; + border-radius: 0.2em; top: 0; left: 0; right: 0; @@ -346,7 +346,6 @@ div[data-role=controlgroup] a.ui-btn-active { right: 0; bottom: 0; font-weight: 400; - background: rgba(0, 0, 0, 0.7); display: flex; flex-direction: column; } diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css index 01ac685cf..4d575c63b 100644 --- a/src/components/cardbuilder/card.css +++ b/src/components/cardbuilder/card.css @@ -160,7 +160,7 @@ button::-moz-focus-inner { background-size: cover; background-repeat: no-repeat; background-position: center center; - border-radius: 2px; + border-radius: 0.2em; display: flex; align-items: center; justify-content: center; @@ -223,6 +223,7 @@ button::-moz-focus-inner { } .cardBox:not(.visualCardBox) .cardPadder { + border-radius: 0.2em; background-color: #242424; } @@ -264,7 +265,7 @@ button::-moz-focus-inner { .visualCardBox { box-shadow: 0 0.0725em 0.29em 0 rgba(0, 0, 0, 0.37); - border-radius: 0.145em; + border-radius: 0.2em; } .innerCardFooter { From bcaf95c4e345fa7beed7776430d929caf74ce152 Mon Sep 17 00:00:00 2001 From: dkanada Date: Thu, 25 Mar 2021 12:24:51 +0900 Subject: [PATCH 4/9] add the background filter back for active sessions --- src/assets/css/dashboard.css | 4 ++++ src/controllers/dashboard/dashboard.js | 4 +++- src/controllers/dashboard/plugins/installed/index.js | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/assets/css/dashboard.css b/src/assets/css/dashboard.css index e9e8d4f2e..09e7f2528 100644 --- a/src/assets/css/dashboard.css +++ b/src/assets/css/dashboard.css @@ -350,6 +350,10 @@ div[data-role=controlgroup] a.ui-btn-active { flex-direction: column; } +.darkenContent { + background: rgba(0, 0, 0, 0.7); +} + .sessionAppName { vertical-align: top; max-width: 200px; diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js index d77a97341..92eb9e238 100644 --- a/src/controllers/dashboard/dashboard.js +++ b/src/controllers/dashboard/dashboard.js @@ -270,7 +270,7 @@ import confirm from '../../components/confirm/confirm'; html += '
'; } - html += '
'; + html += `
`; html += '
'; const clientImage = DashboardPage.getClientImage(session); @@ -608,8 +608,10 @@ import confirm from '../../components/confirm/confirm'; if (imgUrl) { imgElem.classList.add('sessionNowPlayingContent-withbackground'); + row.querySelector('.sessionNowPlayingInnerContent').classList.add('darkenContent'); } else { imgElem.classList.remove('sessionNowPlayingContent-withbackground'); + row.querySelector('.sessionNowPlayingInnerContent').classList.remove('darkenContent'); } } }, diff --git a/src/controllers/dashboard/plugins/installed/index.js b/src/controllers/dashboard/plugins/installed/index.js index 654ae4c29..55d3c0b5b 100644 --- a/src/controllers/dashboard/plugins/installed/index.js +++ b/src/controllers/dashboard/plugins/installed/index.js @@ -66,7 +66,7 @@ function getPluginCardHtml(plugin, pluginConfigurationPages) { if (configPageUrl) { html += ``; } else { - html += '
'; + html += '
'; } if (plugin.HasImage) { From 6a8d06409973efabbbf1e2b313dd77e36fe9613f Mon Sep 17 00:00:00 2001 From: dkanada Date: Fri, 26 Mar 2021 20:09:32 +0900 Subject: [PATCH 5/9] add text color when active device card is darkened --- src/assets/css/dashboard.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assets/css/dashboard.scss b/src/assets/css/dashboard.scss index 09e7f2528..a5209d260 100644 --- a/src/assets/css/dashboard.scss +++ b/src/assets/css/dashboard.scss @@ -352,6 +352,7 @@ div[data-role=controlgroup] a.ui-btn-active { .darkenContent { background: rgba(0, 0, 0, 0.7); + color: #ddd; } .sessionAppName { From 2fc3dff75a001f32f63ae18d697a0c88cc042d6a Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Mon, 12 Apr 2021 22:21:08 +0300 Subject: [PATCH 6/9] Fix border radius for slow TV --- src/components/cardbuilder/card.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/cardbuilder/card.scss b/src/components/cardbuilder/card.scss index 4d575c63b..ac607631a 100644 --- a/src/components/cardbuilder/card.scss +++ b/src/components/cardbuilder/card.scss @@ -110,6 +110,7 @@ button::-moz-focus-inner { .card.show-focus:not(.show-animation) .cardBox.visualCardBox, .card.show-focus:not(.show-animation) .cardBox:not(.visualCardBox) .cardScalable { border: 0.5em solid transparent; + border-radius: 0.7em; /* card border + card border-radius */ } .card.show-animation:focus > .cardBox { From 3d7562d3ffab7ba2040fc90f9a0c334d36d1e06e Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Tue, 13 Apr 2021 15:06:02 +0300 Subject: [PATCH 7/9] Fix missing border radius and Poster/Thumb Card style --- src/components/cardbuilder/card.scss | 14 +++++++++++--- src/themes/purplehaze/theme.css | 5 ----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/components/cardbuilder/card.scss b/src/components/cardbuilder/card.scss index ac607631a..6b8cf3c69 100644 --- a/src/components/cardbuilder/card.scss +++ b/src/components/cardbuilder/card.scss @@ -228,9 +228,17 @@ button::-moz-focus-inner { background-color: #242424; } -.visualCardBox .cardContent { - border-top-left-radius: 0.2em; - border-top-right-radius: 0.2em; +.blurhash-canvas, +.cardContent, +.cardOverlayContainer { + border-radius: 0.2em; +} + +.visualCardBox .blurhash-canvas, +.visualCardBox .cardContent, +.visualCardBox .cardOverlayContainer { + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; } .cardContent-shadow, diff --git a/src/themes/purplehaze/theme.css b/src/themes/purplehaze/theme.css index ad85d3958..b7fbcc46f 100644 --- a/src/themes/purplehaze/theme.css +++ b/src/themes/purplehaze/theme.css @@ -229,11 +229,6 @@ a[data-role=button] { border-radius: 0.8em; } -.visualCardBox .cardOverlayContainer { - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} - .defaultCardBackground1 { background-color: #9c20ab; } From 9562a96f8179e742088cfef23a7e4e9d37b88a9a Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Tue, 13 Apr 2021 15:35:59 +0300 Subject: [PATCH 8/9] Fix lint errors --- src/components/cardbuilder/card.scss | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/cardbuilder/card.scss b/src/components/cardbuilder/card.scss index 6b8cf3c69..610645816 100644 --- a/src/components/cardbuilder/card.scss +++ b/src/components/cardbuilder/card.scss @@ -196,6 +196,7 @@ button::-moz-focus-inner { left: 0; right: 0; bottom: 0; + border-radius: 0.2em; /* Needed in case this is a button */ display: block; @@ -228,19 +229,10 @@ button::-moz-focus-inner { background-color: #242424; } -.blurhash-canvas, -.cardContent, -.cardOverlayContainer { +.blurhash-canvas { border-radius: 0.2em; } -.visualCardBox .blurhash-canvas, -.visualCardBox .cardContent, -.visualCardBox .cardOverlayContainer { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; -} - .cardContent-shadow, .cardBox:not(.visualCardBox) .cardPadder { box-shadow: 0 0.0725em 0.29em 0 rgba(0, 0, 0, 0.37); @@ -780,6 +772,14 @@ button::-moz-focus-inner { bottom: 0; right: 0; user-select: none; + border-radius: 0.2em; +} + +.visualCardBox .blurhash-canvas, +.visualCardBox .cardContent, +.visualCardBox .cardOverlayContainer { + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; } .card-hoverable:hover .cardOverlayContainer { From 6e1a8138b476734558110bc4e74137d4fe169ecb Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Tue, 13 Apr 2021 22:27:11 +0300 Subject: [PATCH 9/9] Remove unnecessary inline styles --- src/controllers/session/login/index.js | 2 +- src/controllers/session/selectServer/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/session/login/index.js b/src/controllers/session/login/index.js index c87d2dd71..b261c5c81 100644 --- a/src/controllers/session/login/index.js +++ b/src/controllers/session/login/index.js @@ -154,7 +154,7 @@ import cardBuilder from '../../../components/cardbuilder/cardBuilder'; html += '
'; html += '
'; html += '
'; - html += `
`; + html += `
`; let imgUrl; if (user.PrimaryImageTag) { diff --git a/src/controllers/session/selectServer/index.js b/src/controllers/session/selectServer/index.js index e248fe154..9ee0000b8 100644 --- a/src/controllers/session/selectServer/index.js +++ b/src/controllers/session/selectServer/index.js @@ -65,7 +65,7 @@ import cardBuilder from '../../../components/cardbuilder/cardBuilder'; cardContainer += '
'; cardContainer += '
'; cardContainer += '
'; - cardContainer += `
`; + cardContainer += `
`; cardContainer += cardImageContainer; cardContainer += '
'; cardContainer += '
';