${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/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(
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/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}`)}
>
`;
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;
diff --git a/src/translations/en.json b/src/translations/en.json
index e423ddcf10..79154aff3d 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"
}
},
@@ -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"
}
}
},