From cd00f7f874587763c10d09b799edef4958c050a9 Mon Sep 17 00:00:00 2001 From: Philip Allgaier Date: Sat, 11 Dec 2021 20:59:42 +0100 Subject: [PATCH 1/6] Fix typo in cover close tilt translation key (#10871) --- src/translations/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/translations/en.json b/src/translations/en.json index e423ddcf10..106e28fefa 100755 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -688,7 +688,7 @@ "open_cover": "Open cover", "close_cover": "Close cover", "open_tilt_cover": "Open cover tilt", - "close_tile_cover": "Close cover tilt", + "close_tilt_cover": "Close cover tilt", "stop_cover": "Stop cover from moving" } }, From deb65e7108e4411af6a2e7080a25a539036708b8 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Sun, 12 Dec 2021 13:19:32 +0100 Subject: [PATCH 2/6] Fix button with images (#10872) --- src/components/ha-chip.ts | 16 ++++++++-------- .../lovelace/components/hui-buttons-base.ts | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/components/ha-chip.ts b/src/components/ha-chip.ts index ce6363e512..2a41ffc760 100644 --- a/src/components/ha-chip.ts +++ b/src/components/ha-chip.ts @@ -18,13 +18,9 @@ export class HaChip extends LitElement { protected render(): TemplateResult { return html` -
+
${this.hasIcon - ? html`
+ ? html`
` : null} @@ -49,6 +45,10 @@ export class HaChip extends LitElement { color: var(--ha-chip-text-color, var(--primary-text-color)); } + .mdc-chip.no-text { + padding: 0 10px; + } + .mdc-chip:hover { color: var(--ha-chip-text-color, var(--primary-text-color)); } @@ -57,8 +57,8 @@ export class HaChip extends LitElement { --mdc-icon-size: 20px; color: var(--ha-chip-icon-color, var(--ha-chip-text-color)); } - .mdc-chip - .mdc-chip__icon--leading:not(.mdc-chip__icon--leading-hidden).no-text { + .mdc-chip.no-text + .mdc-chip__icon--leading:not(.mdc-chip__icon--leading-hidden) { margin-right: -4px; } `; diff --git a/src/panels/lovelace/components/hui-buttons-base.ts b/src/panels/lovelace/components/hui-buttons-base.ts index 7c5a0c60d4..0e0e0c3ad0 100644 --- a/src/panels/lovelace/components/hui-buttons-base.ts +++ b/src/panels/lovelace/components/hui-buttons-base.ts @@ -50,6 +50,7 @@ export class HuiButtonsBase extends LitElement { .stateObj=${stateObj} .overrideIcon=${entityConf.icon} .overrideImage=${entityConf.image} + class=${name ? "" : "no-text"} stateColor slot="icon" > @@ -85,9 +86,21 @@ export class HuiButtonsBase extends LitElement { flex-wrap: wrap; } state-badge { + display: inline-flex; line-height: inherit; - text-align: start; color: var(--secondary-text-color); + align-items: center; + justify-content: center; + width: 24px; + height: 24px; + margin-left: -4px; + margin-top: -2px; + } + state-badge.no-text { + width: 26px; + height: 26px; + margin-left: -3px; + margin-top: -3px; } ha-chip { padding: 4px; From 1f671198aa3ec19c9099d16896745b1b728a2d71 Mon Sep 17 00:00:00 2001 From: Philip Allgaier Date: Sun, 12 Dec 2021 13:24:24 +0100 Subject: [PATCH 3/6] Fix tooltip and aria-label for ZWave JS log download (#10876) --- .../integration-panels/zwave/ha-config-zwave.js | 6 +++++- src/translations/en.json | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js b/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js index f9dc04ddf5..f72844f373 100644 --- a/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js +++ b/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js @@ -129,7 +129,11 @@ class HaConfigZwave extends LocalizeMixin(EventsMixin(PolymerElement)) { [[localize('ui.panel.config.zwave.node_management.header')]] - +
diff --git a/src/translations/en.json b/src/translations/en.json index 106e28fefa..79154aff3d 100755 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -3023,7 +3023,8 @@ "title": "Z-Wave JS Logs", "log_level": "Log Level", "subscribed_to_logs": "Subscribed to Z-Wave JS Log Messages…", - "log_level_changed": "Log Level changed to: {level}" + "log_level_changed": "Log Level changed to: {level}", + "download_logs": "Download logs" } } }, From 2606d55895a0e32569d7f403ba5f5c54cc23f835 Mon Sep 17 00:00:00 2001 From: Philip Allgaier Date: Sun, 12 Dec 2021 13:25:05 +0100 Subject: [PATCH 4/6] Add tooltips and aria-labels to climate modes (#10875) --- src/panels/lovelace/cards/hui-thermostat-card.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/panels/lovelace/cards/hui-thermostat-card.ts b/src/panels/lovelace/cards/hui-thermostat-card.ts index 7ace186bc7..564008d158 100644 --- a/src/panels/lovelace/cards/hui-thermostat-card.ts +++ b/src/panels/lovelace/cards/hui-thermostat-card.ts @@ -19,7 +19,7 @@ import { svg, TemplateResult, } from "lit"; -import { customElement, property, state, query } from "lit/decorators"; +import { customElement, property, query, state } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; import { UNIT_F } from "../../../common/const"; import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element"; @@ -427,6 +427,7 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard { @click=${this._handleAction} tabindex="0" .path=${modeIcons[mode]} + .label=${this.hass!.localize(`component.climate.state._.${mode}`)} > `; From 942150cda290fa085eec58675528d778b0ad02cf Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Sun, 12 Dec 2021 13:27:14 +0100 Subject: [PATCH 5/6] Remove milliseconds from state trigger when 0 (#10879) --- .../trigger/types/ha-automation-trigger-state.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/panels/config/automation/trigger/types/ha-automation-trigger-state.ts b/src/panels/config/automation/trigger/types/ha-automation-trigger-state.ts index 9e362634ea..f48310da8e 100644 --- a/src/panels/config/automation/trigger/types/ha-automation-trigger-state.ts +++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-state.ts @@ -50,6 +50,13 @@ export class HaStateTrigger extends LitElement implements TriggerElement { if (!changedProperties.has("trigger")) { return true; } + if ( + this.trigger.for && + typeof this.trigger.for === "object" && + this.trigger.for.milliseconds === 0 + ) { + delete this.trigger.for.milliseconds; + } // Check for templates in trigger. If found, revert to YAML mode. if (this.trigger && hasTemplate(this.trigger)) { fireEvent( From 85168b3a358d667d3ea471df0ac900fea28a18ac Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Sun, 12 Dec 2021 13:37:28 +0100 Subject: [PATCH 6/6] Bumped version to 20211212.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ddadce10c4..189ceda3a9 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name="home-assistant-frontend", - version="20211211.0", + version="20211212.0", description="The Home Assistant frontend", url="https://github.com/home-assistant/frontend", author="The Home Assistant Authors",