= numericState)
+ (condition.below == null || condition.below > numericState)
);
}
diff --git a/src/panels/lovelace/components/hui-buttons-base.ts b/src/panels/lovelace/components/hui-buttons-base.ts
index 0e0e0c3ad0c9..ff04a931a42e 100644
--- a/src/panels/lovelace/components/hui-buttons-base.ts
+++ b/src/panels/lovelace/components/hui-buttons-base.ts
@@ -9,7 +9,8 @@ import { computeTooltip } from "../common/compute-tooltip";
import { actionHandler } from "../common/directives/action-handler-directive";
import { handleAction } from "../common/handle-action";
import { hasAction } from "../common/has-action";
-import "../../../components/ha-chip";
+import "../../../components/chips/ha-assist-chip";
+import "../../../components/chips/ha-chip-set";
import { haStyleScrollbar } from "../../../resources/styles";
@customElement("hui-buttons-base")
@@ -20,7 +21,7 @@ export class HuiButtonsBase extends LitElement {
protected render(): TemplateResult {
return html`
-
+
${(this.configEntities || []).map((entityConf) => {
const stateObj = this.hass.states[entityConf.entity];
@@ -31,7 +32,8 @@ export class HuiButtonsBase extends LitElement {
: "";
return html`
-
${entityConf.show_icon !== false
? html`
@@ -56,11 +57,10 @@ export class HuiButtonsBase extends LitElement {
>
`
: ""}
- ${name}
-
+
`;
})}
-
+
`;
}
@@ -74,7 +74,7 @@ export class HuiButtonsBase extends LitElement {
haStyleScrollbar,
css`
.ha-scrollbar {
- padding: 8px;
+ padding: 12px;
padding-top: var(--padding-top, 8px);
padding-bottom: var(--padding-bottom, 8px);
width: 100%;
@@ -102,8 +102,9 @@ export class HuiButtonsBase extends LitElement {
margin-left: -3px;
margin-top: -3px;
}
- ha-chip {
- padding: 4px;
+ ha-assist-chip state-badge {
+ margin-right: -4px;
+ --mdc-icon-size: 18px;
}
@media all and (max-width: 450px), all and (max-height: 500px) {
.ha-scrollbar {
diff --git a/src/panels/lovelace/tile-features/hui-cover-position-tile-feature.ts b/src/panels/lovelace/tile-features/hui-cover-position-tile-feature.ts
index c613156cd30d..e4fe3a6ae31e 100644
--- a/src/panels/lovelace/tile-features/hui-cover-position-tile-feature.ts
+++ b/src/panels/lovelace/tile-features/hui-cover-position-tile-feature.ts
@@ -13,6 +13,7 @@ import { UNAVAILABLE } from "../../../data/entity";
import { HomeAssistant } from "../../../types";
import { LovelaceTileFeature } from "../types";
import { CoverPositionTileFeatureConfig } from "./types";
+import { DOMAIN_ATTRIBUTES_UNITS } from "../../../data/entity_attributes";
export const supportsCoverPositionTileFeature = (stateObj: HassEntity) => {
const domain = computeDomain(stateObj.entity_id);
@@ -93,6 +94,8 @@ class HuiCoverPositionTileFeature
"current_position"
)}
.disabled=${this.stateObj!.state === UNAVAILABLE}
+ .tooltipUnit=${DOMAIN_ATTRIBUTES_UNITS.cover.current_position}
+ .locale=${this.hass.locale}
>
`;
diff --git a/src/panels/lovelace/tile-features/hui-cover-tilt-position-tile-feature.ts b/src/panels/lovelace/tile-features/hui-cover-tilt-position-tile-feature.ts
index 00c5768dd437..7607527d0b09 100644
--- a/src/panels/lovelace/tile-features/hui-cover-tilt-position-tile-feature.ts
+++ b/src/panels/lovelace/tile-features/hui-cover-tilt-position-tile-feature.ts
@@ -13,6 +13,7 @@ import { generateTiltSliderTrackBackgroundGradient } from "../../../dialogs/more
import { HomeAssistant } from "../../../types";
import { LovelaceTileFeature } from "../types";
import { CoverTiltPositionTileFeatureConfig } from "./types";
+import { DOMAIN_ATTRIBUTES_UNITS } from "../../../data/entity_attributes";
const GRADIENT = generateTiltSliderTrackBackgroundGradient();
@@ -92,6 +93,8 @@ class HuiCoverTiltPositionTileFeature
"current_tilt_position"
)}
.disabled=${this.stateObj!.state === UNAVAILABLE}
+ .tooltipUnit=${DOMAIN_ATTRIBUTES_UNITS.cover.current_tilt_position}
+ .locale=${this.hass.locale}
>
diff --git a/src/panels/lovelace/tile-features/hui-fan-speed-tile-feature.ts b/src/panels/lovelace/tile-features/hui-fan-speed-tile-feature.ts
index 8e6804d1f458..4b587fb71b7e 100644
--- a/src/panels/lovelace/tile-features/hui-fan-speed-tile-feature.ts
+++ b/src/panels/lovelace/tile-features/hui-fan-speed-tile-feature.ts
@@ -23,6 +23,7 @@ import {
import { HomeAssistant } from "../../../types";
import { LovelaceTileFeature } from "../types";
import { FanSpeedTileFeatureConfig } from "./types";
+import { DOMAIN_ATTRIBUTES_UNITS } from "../../../data/entity_attributes";
export const supportsFanSpeedTileFeature = (stateObj: HassEntity) => {
const domain = computeDomain(stateObj.entity_id);
@@ -126,6 +127,8 @@ class HuiFanSpeedTileFeature extends LitElement implements LovelaceTileFeature {
"percentage"
)}
.disabled=${this.stateObj!.state === UNAVAILABLE}
+ .tooltipUnit=${DOMAIN_ATTRIBUTES_UNITS.fan.percentage}
+ .locale=${this.hass.locale}
>
`;
diff --git a/src/panels/lovelace/tile-features/hui-light-brightness-tile-feature.ts b/src/panels/lovelace/tile-features/hui-light-brightness-tile-feature.ts
index 01d1e763cf99..a08bbf243033 100644
--- a/src/panels/lovelace/tile-features/hui-light-brightness-tile-feature.ts
+++ b/src/panels/lovelace/tile-features/hui-light-brightness-tile-feature.ts
@@ -67,6 +67,8 @@ class HuiLightBrightnessTileFeature
.disabled=${this.stateObj!.state === UNAVAILABLE}
@value-changed=${this._valueChanged}
.label=${this.hass.localize("ui.card.light.brightness")}
+ .tooltipUnit=${"%"}
+ .locale=${this.hass.locale}
>