From 3553b9c00d9fe36e107c71e83e33738eb2fbfb69 Mon Sep 17 00:00:00 2001 From: brian teeman Date: Mon, 29 Nov 2021 09:31:23 +0000 Subject: [PATCH 1/2] [4.0] media manager breadcrumbs The RTL specific css was wrong as can be seen in the before screenshot This PR removes the RTL specific css (should have been scss) and updates the scss to use logical properties instead. This PR also removes an unused class `breadcrumb-item`. To test RTL you will need to install arabic or persian. and dont forget to npm ci There is no visible change in LTR and the RTL changes are as shown below ## Before LTR ## Before RTL ## After LTR ## After RTL --- .../scss/components/_media-breadcrumb.scss | 52 ++++--------------- templates/system/build_incomplete.html | 2 +- templates/system/fatal-error.html | 2 +- templates/system/incompatible.html | 2 +- 4 files changed, 13 insertions(+), 45 deletions(-) diff --git a/build/media_source/com_media/scss/components/_media-breadcrumb.scss b/build/media_source/com_media/scss/components/_media-breadcrumb.scss index 21fdc086d519a..faffa71558c62 100644 --- a/build/media_source/com_media/scss/components/_media-breadcrumb.scss +++ b/build/media_source/com_media/scss/components/_media-breadcrumb.scss @@ -1,11 +1,11 @@ .media-breadcrumb { display: flex; padding: 0; - margin: 0 auto 0 0; + margin-inline-end: auto; font-size: .9rem; line-height: $toolbar-height; background: transparent; - border-left: 1px solid $border-color; + border-inline-start: 1px solid $border-color; ol { display: flex; @@ -20,15 +20,16 @@ } .media-breadcrumb-item { - padding: 0 8px 0 22px; + padding-inline-end: 8px; + padding-inline-start: 22px; background-color: $breadcrumbs-bg; &:first-of-type { - padding-left: 16px; + padding-inline-start: 16px; } &:last-of-type { background-color: $breadcrumbs-current-bg; &::after { - border-left-color: $breadcrumbs-current-bg; + border-inline-start-color: $breadcrumbs-current-bg; } } &:hover { @@ -42,7 +43,7 @@ position: absolute; top: 0; bottom: 0; - left: 100%; + inset-inline-start: 100%; z-index: 2; display: block; width: 0; @@ -51,45 +52,12 @@ content: "" !important; border-top: 23px solid transparent; border-bottom: 23px solid transparent; - border-left: 10px solid transparent; + border-inline-start: 10px solid transparent; } &::before { - border-left-color: $border-color; + border-inline-start-color: $border-color; } &::after { - border-left-color: $breadcrumbs-bg; + border-inline-start-color: $breadcrumbs-bg; } } - -.breadcrumb-item + .breadcrumb-item::before { - display: none; -} - -// RTL override - -html[dir=rtl] .media-breadcrumb { - margin: 0 0 0 auto; -} - -html[dir=rtl] .media-breadcrumb-item::after, .media-breadcrumb-item::before { - right: 100%; - border-right: 10px solid transparent; - border-left: 0; -} - -html[dir=rtl] .media-breadcrumb-item { - padding: 0 22px 0 8px; -} - -html[dir=rtl] .media-breadcrumb-item::before { - border-right-color: #fafafa; -} - -html[dir=rtl] .media-breadcrumb-item:first-of-type { - padding-right: 16px; - padding-left: 0; -} - -html[dir=rtl] .media-breadcrumb-item:last-of-type::after { - border-right: 10px solid #fff; -} diff --git a/templates/system/build_incomplete.html b/templates/system/build_incomplete.html index c9733adbfd009..3e4fd059de25f 100644 --- a/templates/system/build_incomplete.html +++ b/templates/system/build_incomplete.html @@ -5,7 +5,7 @@ Joomla: Environment Setup Incomplete - + diff --git a/templates/system/fatal-error.html b/templates/system/fatal-error.html index 588a426664a6b..f06f19a521b66 100644 --- a/templates/system/fatal-error.html +++ b/templates/system/fatal-error.html @@ -5,7 +5,7 @@ An Error Occurred: {{statusText}} - + diff --git a/templates/system/incompatible.html b/templates/system/incompatible.html index 35c19e961079e..890e613475721 100644 --- a/templates/system/incompatible.html +++ b/templates/system/incompatible.html @@ -5,7 +5,7 @@ Joomla: unsupported PHP version - + From 0f096617cd9d2f2a6056b4897558c5e11425f7cc Mon Sep 17 00:00:00 2001 From: brian teeman Date: Mon, 29 Nov 2021 09:36:38 +0000 Subject: [PATCH 2/2] revert --- templates/system/build_incomplete.html | 2 +- templates/system/fatal-error.html | 2 +- templates/system/incompatible.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/system/build_incomplete.html b/templates/system/build_incomplete.html index 3e4fd059de25f..c9733adbfd009 100644 --- a/templates/system/build_incomplete.html +++ b/templates/system/build_incomplete.html @@ -5,7 +5,7 @@ Joomla: Environment Setup Incomplete - + diff --git a/templates/system/fatal-error.html b/templates/system/fatal-error.html index f06f19a521b66..588a426664a6b 100644 --- a/templates/system/fatal-error.html +++ b/templates/system/fatal-error.html @@ -5,7 +5,7 @@ An Error Occurred: {{statusText}} - + diff --git a/templates/system/incompatible.html b/templates/system/incompatible.html index 890e613475721..35c19e961079e 100644 --- a/templates/system/incompatible.html +++ b/templates/system/incompatible.html @@ -5,7 +5,7 @@ Joomla: unsupported PHP version - +