From 974417ce3db13c3f1d12d29cd13cdc506af8db52 Mon Sep 17 00:00:00 2001 From: Hadi Charara Date: Sat, 2 Jul 2022 22:59:40 -0400 Subject: [PATCH] use inline and block properties now --- src/assets/css/librarybrowser.scss | 118 ++++-------------- src/assets/css/metadataeditor.scss | 7 +- src/components/cardbuilder/card.scss | 27 +--- src/components/indicators/indicators.scss | 10 +- src/components/listview/listview.scss | 6 +- src/components/mediainfo/mediainfo.scss | 14 +-- .../emby-scrollbuttons.scss | 7 +- src/elements/emby-scroller/emby-scroller.scss | 8 +- src/elements/emby-select/emby-select.scss | 20 +-- src/elements/emby-slider/emby-slider.scss | 32 ++--- 10 files changed, 51 insertions(+), 198 deletions(-) diff --git a/src/assets/css/librarybrowser.scss b/src/assets/css/librarybrowser.scss index d251bde1c1..60347ecb93 100644 --- a/src/assets/css/librarybrowser.scss +++ b/src/assets/css/librarybrowser.scss @@ -137,14 +137,11 @@ .pageTitle { display: inline-flex; - margin: 0 0 0 0.5em; + margin-block: 0; + margin-inline: 0.5em 0; height: 1.7em; align-items: center; flex-shrink: 1; - - [dir='rtl'] & { - margin: 0 0.5em 0 0; - } } .pageTitleWithDefaultLogo { @@ -216,25 +213,17 @@ align-items: center; text-decoration: none; color: inherit; - padding: 0.9em 0 0.9em 2.4em !important; + padding-block: 0.9em !important; + padding-inline: 2.4em 0 !important; flex-grow: 1; font-weight: 400 !important; margin: 0 !important; border-radius: 0 !important; - - [dir='rtl'] & { - padding: 0.9em 2.4em 0.9em 0 !important; - } } .navMenuOptionIcon { - margin-right: 1.2em; + margin-inline-end: 1.2em; flex-shrink: 0; - - [dir='rtl'] & { - margin-right: unset; - margin-left: 1.2em; - } } .navMenuOptionText { @@ -243,15 +232,9 @@ } .sidebarHeader { - margin: 1em 0 0.5em; - - [dir='ltr'] & { - padding-left: 1.2em; - } - - [dir='rtl'] & { - padding-right: 1.2em; - } + padding-inline-start: 1.2em; + margin-block: 1em 0.5em; + margin-inline: 0; } .dashboardDocument .skinBody { @@ -282,7 +265,7 @@ .dashboardDocument .mainDrawer { z-index: inherit !important; - left: 0 !important; + inset-inline-start: 0 !important; top: 0 !important; transform: none !important; box-shadow: none !important; @@ -295,7 +278,7 @@ } .dashboardDocument .skinBody { - left: 20em; + inset-inline-start: 20em; } } @@ -494,31 +477,16 @@ .detailPageContent { display: flex; flex-direction: column; - padding-left: 32.45vw; - padding-right: 2%; + padding-inline: 3.245vw 2%; .layout-mobile & { - padding-left: 5%; - padding-right: 5%; + padding-inline: 5%; } .layout-desktop &, .layout-tv & { .emby-scroller { - margin-left: 0; - } - } - - [dir="rtl"] & { - padding-right: 32.45vw; - padding-left: 2%; - - .layout-desktop &, - .layout-tv & { - .emby-scroller { - margin-left: unset; - margin-right: 0; - } + margin-inline-start: 0; } } } @@ -680,29 +648,18 @@ .layout-mobile & { display: block; position: relative; - padding: 0.5rem 5%; + padding-block: 0.5rem; + padding-inline: 5%; } .layout-desktop & { position: relative; - padding-left: 32.45vw; + padding-inline-start: 32.45vw; } .layout-tv & { display: block; - padding-left: 32.45vw; - } - - [dir="rtl"] & { - .layout-mobile & { - padding: 0.5rem 0 0 5%; - } - - .layout-desktop &, - .layout-tv & { - padding-right: 32.45vw; - padding-left: unset; - } + padding-inline-start: 32.45vw; } } @@ -731,13 +688,9 @@ } .infoText { - text-align: left; + text-align: start; min-width: 0; max-width: 100%; - - [dir="rtl"] & { - text-align: right; - } } .detailPageSecondaryContainer { @@ -770,13 +723,13 @@ } .layout-mobile & { - left: 5%; + inset-inline-start: 5%; bottom: 1rem; max-width: 30vw; filter: drop-shadow(0 0 0.5rem #000); @media all and (max-width: 32em) { - left: 0; + inset-inline-start: 0; bottom: 0; } @@ -788,30 +741,17 @@ } .layout-desktop & { - left: 3.3%; + inset-inline-start: 3.3%; top: -80%; width: 25vw; } .layout-tv & { - left: 5%; + inset-inline-start: 5%; top: 50%; width: 25vw; transform: translateY(-50%); } - - [dir="rtl"] & { - left: unset; - - .layout-mobile &, - .layout-tv & { - right: 5%; - } - - .layout-desktop & { - right: 3.3%; - } - } } .detailPagePrimaryContent { @@ -1211,21 +1151,11 @@ div:not(.sectionTitleContainer-cards) > .sectionTitle-cards { } .padded-left { - padding-left: 3.3%; - - [dir="rtl"] & { - padding-right: 3.3%; - padding-left: unset; - } + padding-inline-start: 3.3%; } .padded-right { - padding-right: 3.3%; - - [dir="rtl"] & { - padding-right: unset; - padding-left: 3.3%; - } + padding-inline-end: 3.3%; } .padded-top { diff --git a/src/assets/css/metadataeditor.scss b/src/assets/css/metadataeditor.scss index 190f53187f..c17998887b 100644 --- a/src/assets/css/metadataeditor.scss +++ b/src/assets/css/metadataeditor.scss @@ -54,11 +54,10 @@ @media all and (min-width: 50em) { .editPageSidebar { position: fixed; - top: 5.2em; - bottom: 0; - left: 0; + inset-block: 5.2em 0; + inset-inline-start: 0; width: 30%; - border-right: 1px solid #555; + border-inline-end: 1px solid #555; display: block; } diff --git a/src/components/cardbuilder/card.scss b/src/components/cardbuilder/card.scss index c3858252b2..6f9ee2699a 100644 --- a/src/components/cardbuilder/card.scss +++ b/src/components/cardbuilder/card.scss @@ -302,11 +302,7 @@ button::-moz-focus-inner { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - text-align: left; - - [dir="rtl"] & { - text-align: right; - } + text-align: start; } .dialog .cardText { @@ -400,31 +396,21 @@ button::-moz-focus-inner { } .cardIndicators { - right: 0.225em; + inset-inline-end: 0.225em; top: 0.225em; position: absolute; display: flex; align-items: center; contain: layout style; - - [dir="rtl"] & { - right: unset; - left: 0.225em; - } } .cardProgramAttributeIndicators { top: 0; - left: 0; + inset-inline-start: 0; position: absolute; display: flex; text-transform: uppercase; font-size: 92%; - - [dir="rtl"] & { - left: unset; - right: 0; - } } .programAttributeIndicator { @@ -444,12 +430,7 @@ button::-moz-focus-inner { .cardOverlayButton-br { position: absolute; bottom: 0; - right: 0; - - [dir="rtl"] & { - right: unset; - left: 0; - } + inset-inline-end: 0; } .cardOverlayButtonIcon { diff --git a/src/components/indicators/indicators.scss b/src/components/indicators/indicators.scss index 20eaec4cb7..1c23c9f1a2 100644 --- a/src/components/indicators/indicators.scss +++ b/src/components/indicators/indicators.scss @@ -7,14 +7,8 @@ .itemProgressBarForeground { position: absolute; - top: 0; - left: 0; - bottom: 0; - - [dir="rtl"] & { - left: unset; - right: 0; - } + inset-block: 0; + inset-inline-start: 0; } .indicator { diff --git a/src/components/listview/listview.scss b/src/components/listview/listview.scss index 4bf98767fb..e8f3401318 100644 --- a/src/components/listview/listview.scss +++ b/src/components/listview/listview.scss @@ -9,14 +9,10 @@ margin: 0; display: block; align-items: center; - text-align: left; + text-align: start; padding: 0.25em 0.25em 0.25em 0.5em; cursor: pointer; overflow: hidden; - - [dir='rtl'] & { - text-align: right; - } } .listItem-withContentWrapper { diff --git a/src/components/mediainfo/mediainfo.scss b/src/components/mediainfo/mediainfo.scss index 4c43f41fea..74ba9d0f6b 100644 --- a/src/components/mediainfo/mediainfo.scss +++ b/src/components/mediainfo/mediainfo.scss @@ -1,10 +1,7 @@ .mediaInfoItem { - margin: 0 1em 0 0; + margin-block: 0; + margin-inline: 0 1em; padding: 0; - - [dir="rtl"] & { - margin: 0 0 0 1em; - } } .mediaInfoText { @@ -29,12 +26,7 @@ } .mediaInfoItem:last-child { - margin-right: 0; - - [dir='rtl'] & { - margin-right: unset; - margin-left: 0; - } + margin-inline-end: 0; } .starRatingContainer { diff --git a/src/elements/emby-scrollbuttons/emby-scrollbuttons.scss b/src/elements/emby-scrollbuttons/emby-scrollbuttons.scss index a50424a644..c0bc38317f 100644 --- a/src/elements/emby-scrollbuttons/emby-scrollbuttons.scss +++ b/src/elements/emby-scrollbuttons/emby-scrollbuttons.scss @@ -1,7 +1,7 @@ .emby-scrollbuttons { position: absolute; top: 0; - right: 0; + inset-inline-end: 0; align-items: center; justify-content: center; min-width: 104px; @@ -10,11 +10,6 @@ z-index: 1; color: #fff; display: flex; - - [dir='rtl'] & { - left: 0; - right: unset; - } } .emby-scrollbuttons-button > .material-icons { diff --git a/src/elements/emby-scroller/emby-scroller.scss b/src/elements/emby-scroller/emby-scroller.scss index bf54f07a77..130d0f6042 100644 --- a/src/elements/emby-scroller/emby-scroller.scss +++ b/src/elements/emby-scroller/emby-scroller.scss @@ -9,13 +9,7 @@ /* align first card in scroller to heading */ .itemsContainer > .card > .cardBox { - margin-left: 0; - margin-right: 1.2em; - - [dir="rtl"] & { - margin-right: 0; - margin-left: 1.2em; - } + margin-inline: 0 1.2em; } .servers > .card > .cardBox { diff --git a/src/elements/emby-select/emby-select.scss b/src/elements/emby-select/emby-select.scss index dfac666023..73d32ea12a 100644 --- a/src/elements/emby-select/emby-select.scss +++ b/src/elements/emby-select/emby-select.scss @@ -11,17 +11,14 @@ /* General select styles: change as needed */ font-family: inherit; font-weight: inherit; - padding: 0.5em 1.9em 0.5em 0.5em; + padding-block: 0.5em 0.5em; + padding-inline: 0.5em 1.9em; /* Prevent padding from causing width overflow */ box-sizing: border-box; outline: none !important; -webkit-tap-highlight-color: rgba(0, 0, 0, 0); width: 100%; - - [dir="rtl"] & { - padding: 0.5em 0.5em 0.5em 1.9em; - } } .emby-select[disabled] { @@ -39,11 +36,9 @@ .selectContainer-inline > .emby-select { padding: 0.3em 1.9em 0.3em 0.5em; + padding-block: 0.3em; + padding-inline: 0.5em 0.9em; font-size: inherit; - - [dir="rtl"] & { - padding: 0.3em 0.5em 0.3em 1.9em; - } } .selectContainer-inline > .emby-select[disabled] { @@ -100,15 +95,10 @@ .selectArrowContainer { position: absolute; - right: 0.3em; + inset-inline-end: 0.3em; top: 0.2em; color: inherit; pointer-events: none; - - [dir="rtl"] & { - right: unset; - left: 0.3em; - } } .selectContainer-inline > .selectArrowContainer { diff --git a/src/elements/emby-slider/emby-slider.scss b/src/elements/emby-slider/emby-slider.scss index 0aa6204ca5..0d73f9a038 100644 --- a/src/elements/emby-slider/emby-slider.scss +++ b/src/elements/emby-slider/emby-slider.scss @@ -151,15 +151,10 @@ width: 100%; box-sizing: border-box; top: 50%; - left: 0; + inset-inline-start: 0; position: absolute; - padding: 0 0.54em; /* half of slider thumb size */ - - [dir="rtl"] & { - left: unset; - right: 0; - padding: 0 0 0 0.54em; - } + padding-block: 0; + padding-inline: 0.54em;/* half of slider thumb size */ } .mdl-slider-background-flex { @@ -168,16 +163,11 @@ margin-top: -0.1em; width: 100%; top: 50%; - left: 0; + inset-inline-start: 0; display: flex; overflow: hidden; border: 0; padding: 0; - - [dir="rtl"] & { - left: unset; - right: 0; - } } .mdl-slider-background-flex-inner { @@ -188,16 +178,11 @@ .mdl-slider-background-lower { /* transition: width 0.18s cubic-bezier(0.4, 0, 0.2, 1); */ position: absolute; - left: 0; + inset-inline-start: 0; width: 0; top: 0; bottom: 0; background-color: #00a4dc; - - [dir="rtl"] & { - left: unset; - right: 0; - } } .mdl-slider-background-lower-clear { @@ -227,11 +212,8 @@ position: absolute; left: 0; right: 0; - margin: 0 0.54em; /* half of slider thumb size */ - - [dir="rtl"] & { - margin: 0 0 0 0.54em; - } + margin-block: 0; + margin-inline: 0.54em; /* half of slider thumb size */ } .sliderBubble {