From 55e9ebc4d287fd73258f5e7c23f2ba4b621136e0 Mon Sep 17 00:00:00 2001 From: Yosi Levy <37745463+yosilevy@users.noreply.github.com> Date: Mon, 11 Jul 2022 16:47:22 +0300 Subject: [PATCH] Energy panel/cards - RTL fixes (#13171) --- src/components/chart/ha-chart-base.ts | 1 + src/panels/config/energy/components/styles.ts | 6 +++++ .../energy/hui-energy-distribution-card.ts | 1 + .../energy/hui-energy-sources-table-card.ts | 7 ++++++ .../lovelace/cards/hui-humidifier-card.ts | 1 + .../components/hui-energy-period-selector.ts | 23 ++++++++----------- .../components/hui-generic-entity-row.ts | 5 +++- .../entity-rows/hui-sensor-entity-row.ts | 5 +++- 8 files changed, 34 insertions(+), 15 deletions(-) diff --git a/src/components/chart/ha-chart-base.ts b/src/components/chart/ha-chart-base.ts index 84c4132849..277ac615d0 100644 --- a/src/components/chart/ha-chart-base.ts +++ b/src/components/chart/ha-chart-base.ts @@ -376,6 +376,7 @@ export default class HaChartBase extends LitElement { .chartTooltip .title { text-align: center; font-weight: 500; + direction: ltr; } .chartTooltip .footer { font-weight: 500; diff --git a/src/panels/config/energy/components/styles.ts b/src/panels/config/energy/components/styles.ts index 5aab3c4dbc..d980606a44 100644 --- a/src/panels/config/energy/components/styles.ts +++ b/src/panels/config/energy/components/styles.ts @@ -8,6 +8,9 @@ export const energyCardStyles = css` height: 32px; width: 32px; margin-right: 8px; + margin-inline-end: 8px; + margin-inline-start: initial; + direction: var(--direction); } h3 { margin-top: 24px; @@ -24,6 +27,9 @@ export const energyCardStyles = css` .row ha-icon, .row img { margin-right: 16px; + margin-inline-end: 16px; + margin-inline-start: initial; + direction: var(--direction); } .row img { height: 24px; diff --git a/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts b/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts index c223a65de8..bfd67198ac 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts @@ -699,6 +699,7 @@ class HuiEnergyDistrubutionCard } .card-content { position: relative; + direction: ltr; } .lines { position: absolute; diff --git a/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts b/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts index 4b8681bd0e..cf584d0d73 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts @@ -900,6 +900,7 @@ export class HuiEnergySourcesTableCard .mdc-data-table__cell { color: var(--primary-text-color); border-bottom-color: var(--divider-color); + text-align: var(--float-start); } .mdc-data-table__row:not(.mdc-data-table__row--selected):hover { background-color: rgba(var(--rgb-primary-text-color), 0.04); @@ -925,6 +926,9 @@ export class HuiEnergySourcesTableCard .cell-bullet { width: 32px; padding-right: 0; + padding-inline-end: 0; + padding-inline-start: 16px; + direction: var(--direction); } .bullet { border-width: 1px; @@ -933,6 +937,9 @@ export class HuiEnergySourcesTableCard height: 16px; width: 32px; } + .mdc-data-table__cell--numeric { + direction: ltr; + } `; } } diff --git a/src/panels/lovelace/cards/hui-humidifier-card.ts b/src/panels/lovelace/cards/hui-humidifier-card.ts index 9baf03d160..79ce84b871 100644 --- a/src/panels/lovelace/cards/hui-humidifier-card.ts +++ b/src/panels/lovelace/cards/hui-humidifier-card.ts @@ -356,6 +356,7 @@ export class HuiHumidifierCard extends LitElement implements LovelaceCard { height: 50%; top: 45%; left: 50%; + direction: ltr; } #set-values { diff --git a/src/panels/lovelace/components/hui-energy-period-selector.ts b/src/panels/lovelace/components/hui-energy-period-selector.ts index 38011288fd..4a943b9ab8 100644 --- a/src/panels/lovelace/components/hui-energy-period-selector.ts +++ b/src/panels/lovelace/components/hui-energy-period-selector.ts @@ -1,10 +1,5 @@ import "@material/mwc-button/mwc-button"; -import { - mdiChevronLeft, - mdiChevronRight, - mdiCompare, - mdiCompareRemove, -} from "@mdi/js"; +import { mdiCompare, mdiCompareRemove } from "@mdi/js"; import { addDays, addMonths, @@ -35,9 +30,12 @@ import { import { toggleAttribute } from "../../../common/dom/toggle_attribute"; import "../../../components/ha-button-toggle-group"; import "../../../components/ha-icon-button"; +import "../../../components/ha-icon-button-prev"; +import "../../../components/ha-icon-button-next"; import { EnergyData, getEnergyDataCollection } from "../../../data/energy"; import { SubscribeMixin } from "../../../mixins/subscribe-mixin"; import { HomeAssistant, ToggleButton } from "../../../types"; +import { computeRTLDirection } from "../../../common/util/compute_rtl"; @customElement("hui-energy-period-selector") export class HuiEnergyPeriodSelector extends SubscribeMixin(LitElement) { @@ -116,20 +114,18 @@ export class HuiEnergyPeriodSelector extends SubscribeMixin(LitElement) { this._endDate || new Date(), this.hass.locale )}`} - - + + > ${this.hass.localize( "ui.panel.lovelace.components.energy_period_selector.today" @@ -142,6 +138,7 @@ export class HuiEnergyPeriodSelector extends SubscribeMixin(LitElement) { .active=${this._period} dense @value-changed=${this._handleView} + .dir=${computeRTLDirection(this.hass)} > ${this.narrow ? html`