From a4f58030163ffae895302148b7ac87c3d9da041e Mon Sep 17 00:00:00 2001 From: Hadi Charara Date: Mon, 3 Oct 2022 13:36:26 -0400 Subject: [PATCH] Fixed linting issues --- src/assets/css/librarybrowser.scss | 20 +++++-------- src/components/actionSheet/actionSheet.scss | 1 - src/components/alphaPicker/style.scss | 2 +- src/components/cardbuilder/card.scss | 3 +- src/components/imageUploader/style.scss | 2 +- src/components/imageeditor/imageeditor.scss | 6 ++-- .../libraryoptionseditor/style.scss | 4 +-- src/components/listview/listview.scss | 14 +++++----- src/components/mediaLibraryCreator/style.scss | 4 +-- src/components/mediaLibraryEditor/style.scss | 4 +-- src/components/metadataEditor/style.scss | 4 +-- src/components/multiSelect/multiSelect.scss | 2 +- src/components/playerstats/playerstats.scss | 1 - src/components/subtitleuploader/style.scss | 3 +- src/components/tvproviders/style.scss | 4 +-- src/elements/emby-input/emby-input.scss | 28 +++++++------------ src/elements/emby-scroller/emby-scroller.scss | 10 +++---- 17 files changed, 47 insertions(+), 65 deletions(-) diff --git a/src/assets/css/librarybrowser.scss b/src/assets/css/librarybrowser.scss index 4452e09b96..319c629fe5 100644 --- a/src/assets/css/librarybrowser.scss +++ b/src/assets/css/librarybrowser.scss @@ -536,7 +536,6 @@ .reviewDate { [dir="ltr"] & { margin-left: 1em; - } [dir="rtl"] & { @@ -546,6 +545,7 @@ .reviewScore { position: absolute; + [dir="ltr"] & { left: 0.8em; } @@ -800,20 +800,14 @@ .layout-tv & { display: block; } +} - [dir="ltr"] & { - .layout-desktop &, - .layout-tv & { - padding-left: 32.45vw; - } - } +.layout-desktop [dir="rtl"] .detailPagePrimaryContainer { + padding-right: 32.45vw; +} - [dir="rtl"] & { - .layout-desktop &, - .layout-tv & { - padding-right: 32.45vw; - } - } +.layout-desktop [dir="ltr"] .detailPagePrimaryContainer { + padding-left: 32.45vw; } .layout-desktop .detailRibbon { diff --git a/src/components/actionSheet/actionSheet.scss b/src/components/actionSheet/actionSheet.scss index 6961c99fc7..9a9234ffcf 100644 --- a/src/components/actionSheet/actionSheet.scss +++ b/src/components/actionSheet/actionSheet.scss @@ -47,7 +47,6 @@ .actionsheetListItemBody { [dir="ltr"] & { padding: 0.4em 1em 0.4em 0.6em !important; - } [dir="rtl"] & { diff --git a/src/components/alphaPicker/style.scss b/src/components/alphaPicker/style.scss index a764937165..86d7e773e1 100644 --- a/src/components/alphaPicker/style.scss +++ b/src/components/alphaPicker/style.scss @@ -117,7 +117,7 @@ [dir="rtl"] & { left: 0.4em; - left: max(env(safe-area-inset-left), 0.4em) + left: max(env(safe-area-inset-left), 0.4em); } } diff --git a/src/components/cardbuilder/card.scss b/src/components/cardbuilder/card.scss index b8b37a7a00..e43b488dbe 100644 --- a/src/components/cardbuilder/card.scss +++ b/src/components/cardbuilder/card.scss @@ -302,9 +302,9 @@ button::-moz-focus-inner { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + [dir="ltr"] & { text-align: left; - } [dir="rtl"] & { @@ -454,7 +454,6 @@ button::-moz-focus-inner { [dir="ltr"] & { right: 0; - } [dir="rtl"] & { diff --git a/src/components/imageUploader/style.scss b/src/components/imageUploader/style.scss index 5944b09f67..3d67181c4f 100644 --- a/src/components/imageUploader/style.scss +++ b/src/components/imageUploader/style.scss @@ -12,5 +12,5 @@ } .raised.raised-mini.btnBrowse { - margin-left:1.5em; + margin-left: 1.5em; } diff --git a/src/components/imageeditor/imageeditor.scss b/src/components/imageeditor/imageeditor.scss index 7705b634a2..a127d58055 100644 --- a/src/components/imageeditor/imageeditor.scss +++ b/src/components/imageeditor/imageeditor.scss @@ -14,16 +14,16 @@ } [dir="rtl"] & { - margin-right: 1em + margin-right: 1em; } } .btnOpenUploadMenu { [dir="ltr"] & { - margin-left: .5em; + margin-left: 0.5em; } [dir="rtl"] & { - margin-right: .5em; + margin-right: 0.5em; } } diff --git a/src/components/libraryoptionseditor/style.scss b/src/components/libraryoptionseditor/style.scss index a632e1bc9b..a3760f36c3 100644 --- a/src/components/libraryoptionseditor/style.scss +++ b/src/components/libraryoptionseditor/style.scss @@ -1,9 +1,9 @@ .raised.btnImageOptionsForType { [dir="ltr"] & { - margin-left:1.5em; + margin-left: 1.5em; } [dir="rtl"] & { - margin-right:1.5em; + margin-right: 1.5em; } } diff --git a/src/components/listview/listview.scss b/src/components/listview/listview.scss index 75324e6449..9270331252 100644 --- a/src/components/listview/listview.scss +++ b/src/components/listview/listview.scss @@ -1,3 +1,10 @@ +.listItem, +.listItemBody, +.listItemMediaInfo { + display: flex; + contain: layout style; +} + .listItem { background: transparent; border: 0; @@ -104,13 +111,6 @@ justify-content: center; } -.listItem, -.listItemBody, -.listItemMediaInfo { - display: flex; - contain: layout style; -} - .layout-tv .listItemBody { padding: 0.35em 0.75em; } diff --git a/src/components/mediaLibraryCreator/style.scss b/src/components/mediaLibraryCreator/style.scss index 245bef567f..567d054b4c 100644 --- a/src/components/mediaLibraryCreator/style.scss +++ b/src/components/mediaLibraryCreator/style.scss @@ -10,10 +10,10 @@ .listItem.listItem-border.lnkPath { [dir="ltr"] & { - padding-left:.5em; + padding-left: 0.5em; } [dir="rtl"] & { - padding-right:.5em; + padding-right: 0.5em; } } diff --git a/src/components/mediaLibraryEditor/style.scss b/src/components/mediaLibraryEditor/style.scss index 245bef567f..567d054b4c 100644 --- a/src/components/mediaLibraryEditor/style.scss +++ b/src/components/mediaLibraryEditor/style.scss @@ -10,10 +10,10 @@ .listItem.listItem-border.lnkPath { [dir="ltr"] & { - padding-left:.5em; + padding-left: 0.5em; } [dir="rtl"] & { - padding-right:.5em; + padding-right: 0.5em; } } diff --git a/src/components/metadataEditor/style.scss b/src/components/metadataEditor/style.scss index 37bfdbe66b..bf10dcdcdd 100644 --- a/src/components/metadataEditor/style.scss +++ b/src/components/metadataEditor/style.scss @@ -10,10 +10,10 @@ .marginLeft { [dir="ltr"] & { - margin-left:1em; + margin-left: 1em; } [dir="rtl"] & { - margin-right:1em; + margin-right: 1em; } } diff --git a/src/components/multiSelect/multiSelect.scss b/src/components/multiSelect/multiSelect.scss index 8ffd666207..2475d213b5 100644 --- a/src/components/multiSelect/multiSelect.scss +++ b/src/components/multiSelect/multiSelect.scss @@ -42,5 +42,5 @@ } .btnSelectionPanelOptions { - margin-left:auto; + margin-left: auto; } diff --git a/src/components/playerstats/playerstats.scss b/src/components/playerstats/playerstats.scss index 08e26a7a7c..f74f647a37 100644 --- a/src/components/playerstats/playerstats.scss +++ b/src/components/playerstats/playerstats.scss @@ -55,7 +55,6 @@ [dir="ltr"] & { margin-left: 1em; - } [dir="rtl"] & { diff --git a/src/components/subtitleuploader/style.scss b/src/components/subtitleuploader/style.scss index a680e05da6..c0bfebe912 100644 --- a/src/components/subtitleuploader/style.scss +++ b/src/components/subtitleuploader/style.scss @@ -11,6 +11,5 @@ } .raised.raised-mini.btnBrowse { - margin-left:1.5em; + margin-left: 1.5em; } - diff --git a/src/components/tvproviders/style.scss b/src/components/tvproviders/style.scss index bbd8c88c21..6618e5c0e0 100644 --- a/src/components/tvproviders/style.scss +++ b/src/components/tvproviders/style.scss @@ -1,9 +1,9 @@ .guideProviderSelectListings { [dir="ltr"] & { - margin:0 0 0 .5em; + margin: 0 0 0 0.5em; } [dir="rtl"] & { - margin:0 .5em 0 0; + margin: 0 0.5em 0 0; } } diff --git a/src/elements/emby-input/emby-input.scss b/src/elements/emby-input/emby-input.scss index 3341f03b4f..c71069981b 100644 --- a/src/elements/emby-input/emby-input.scss +++ b/src/elements/emby-input/emby-input.scss @@ -45,26 +45,18 @@ margin: 0 0.5em 1.8em; } -.inlineForm .inputContainer:first-child, -.inlineForm .selectContainer:first-child { - [dir="ltr"] & { - margin-left: 0; - } - - [dir="rtl"] & { - margin-right: 0 - } +[dir="rtl"] .inlineForm .inputContainer:last-child, +[dir="rtl"] .inlineForm .selectContainer:last-child, +[dir="ltr"] .inlineForm .inputContainer:first-child, +[dir="ltr"] .inlineForm .selectContainer:first-child { + margin-left: 0; } -.inlineForm .inputContainer:last-child, -.inlineForm .selectContainer:last-child { - [dir="ltr"] & { - margin-right: 0; - } - - [dir="rtl"] & { - margin-left: 0; - } +[dir="ltr"] .inlineForm .inputContainer:last-child, +[dir="ltr"] .inlineForm .selectContainer:last-child, +[dir="rtl"] .inlineForm .inputContainer:first-child, +[dir="rtl"] .inlineForm .selectContainer:first-child { + margin-right: 0; } .inputLabel { diff --git a/src/elements/emby-scroller/emby-scroller.scss b/src/elements/emby-scroller/emby-scroller.scss index c362bccffb..b02fb00096 100644 --- a/src/elements/emby-scroller/emby-scroller.scss +++ b/src/elements/emby-scroller/emby-scroller.scss @@ -9,6 +9,11 @@ margin-right: max(env(safe-area-inset-right), 3.3%); } +.servers > .card > .cardBox { + margin-left: 0.6em; + margin-right: 0.6em; +} + /* align first card in scroller to heading */ .itemsContainer > .card > .cardBox { [dir="ltr"] & { @@ -22,11 +27,6 @@ } } -.servers > .card > .cardBox { - margin-left: 0.6em; - margin-right: 0.6em; -} - .layout-tv .emby-scroller, .layout-mobile .emby-scroller { padding-left: 3.3%;