From ca6a7bfbe2cb28aa301a3b2403d041a56b8b6260 Mon Sep 17 00:00:00 2001 From: Yosi Levy <37745463+yosilevy@users.noreply.github.com> Date: Wed, 20 Jul 2022 15:37:48 +0300 Subject: [PATCH] Additional RTL energy fixes (#13182) --- src/panels/lovelace/cards/energy/hui-energy-compare-card.ts | 3 +++ .../lovelace/cards/energy/hui-energy-distribution-card.ts | 3 +++ .../cards/energy/hui-energy-grid-neutrality-gauge-card.ts | 1 + .../cards/energy/hui-energy-solar-consumed-gauge-card.ts | 1 + src/panels/lovelace/views/hui-masonry-view.ts | 2 +- src/panels/lovelace/views/hui-sidebar-view.ts | 2 +- 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/panels/lovelace/cards/energy/hui-energy-compare-card.ts b/src/panels/lovelace/cards/energy/hui-energy-compare-card.ts index 0f8181c44c..46f0a317e0 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-compare-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-compare-card.ts @@ -26,6 +26,8 @@ export class HuiEnergyCompareCard @state() private _endCompare?: Date; + @property({ type: Boolean, reflect: true }) hidden = true; + public getCardSize(): Promise | number { return 1; } @@ -82,6 +84,7 @@ export class HuiEnergyCompareCard this._end = data.end; this._startCompare = data.startCompare; this._endCompare = data.endCompare; + this.hidden = !this._startCompare; } private _stopCompare(): void { 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 bfd67198ac..7bc18a6f92 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts @@ -697,6 +697,9 @@ class HuiEnergyDistrubutionCard :host { --mdc-icon-size: 24px; } + ha-card { + min-width: 210px; + } .card-content { position: relative; direction: ltr; diff --git a/src/panels/lovelace/cards/energy/hui-energy-grid-neutrality-gauge-card.ts b/src/panels/lovelace/cards/energy/hui-energy-grid-neutrality-gauge-card.ts index bdc0892a62..9e6ad9edec 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-grid-neutrality-gauge-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-grid-neutrality-gauge-card.ts @@ -161,6 +161,7 @@ class HuiEnergyGridGaugeCard ha-gauge { width: 100%; max-width: 250px; + direction: ltr; } .name { diff --git a/src/panels/lovelace/cards/energy/hui-energy-solar-consumed-gauge-card.ts b/src/panels/lovelace/cards/energy/hui-energy-solar-consumed-gauge-card.ts index 756e78410f..c7c8f3c829 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-solar-consumed-gauge-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-solar-consumed-gauge-card.ts @@ -157,6 +157,7 @@ class HuiEnergySolarGaugeCard ha-gauge { width: 100%; max-width: 250px; + direction: ltr; } .name { diff --git a/src/panels/lovelace/views/hui-masonry-view.ts b/src/panels/lovelace/views/hui-masonry-view.ts index f8e7e1bbe8..687d254af8 100644 --- a/src/panels/lovelace/views/hui-masonry-view.ts +++ b/src/panels/lovelace/views/hui-masonry-view.ts @@ -322,7 +322,7 @@ export class MasonryView extends LitElement implements LovelaceViewElement { min-width: 0; } - .column > * { + .column > *:not([hidden]) { display: block; margin: var(--masonry-view-card-margin, 4px 4px 8px); } diff --git a/src/panels/lovelace/views/hui-sidebar-view.ts b/src/panels/lovelace/views/hui-sidebar-view.ts index 41cb2ef116..38f3d871ff 100644 --- a/src/panels/lovelace/views/hui-sidebar-view.ts +++ b/src/panels/lovelace/views/hui-sidebar-view.ts @@ -223,7 +223,7 @@ export class SideBarView extends LitElement implements LovelaceViewElement { box-sizing: border-box; } - .container > div > * { + .container > div > *:not([hidden]) { display: block; margin: var(--masonry-view-card-margin, 4px 4px 8px); }