diff --git a/src/components/chips/ha-filter-chip.ts b/src/components/chips/ha-filter-chip.ts index 8066b7e87810..361c2eaeaa63 100644 --- a/src/components/chips/ha-filter-chip.ts +++ b/src/components/chips/ha-filter-chip.ts @@ -30,6 +30,7 @@ export class HaFilterChip extends FilterChip { var(--rgb-primary-text-color), 0.15 ); + --_label-text-font: var(--ha-font-family-body); border-radius: var(--ha-border-radius-md); } `, diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts index 96fd43225b79..6e7ffbb8a9a8 100644 --- a/src/panels/config/automation/add-automation-element-dialog.ts +++ b/src/panels/config/automation/add-automation-element-dialog.ts @@ -1172,7 +1172,7 @@ class DialogAddAutomationElement --md-list-item-trailing-space: var(--md-list-item-leading-space); --md-list-item-bottom-space: var(--ha-space-1); --md-list-item-top-space: var(--md-list-item-bottom-space); - --md-list-item-supporting-text-font: var(--ha-font-size-s); + --md-list-item-supporting-text-font: var(--ha-font-family-body); --md-list-item-one-line-container-height: var(--ha-space-10); } ha-bottom-sheet .groups { @@ -1236,7 +1236,7 @@ class DialogAddAutomationElement --md-list-item-trailing-space: var(--md-list-item-leading-space); --md-list-item-bottom-space: var(--ha-space-2); --md-list-item-top-space: var(--md-list-item-bottom-space); - --md-list-item-supporting-text-font: var(--ha-font-size-s); + --md-list-item-supporting-text-font: var(--ha-font-family-body); gap: var(--ha-space-2); padding: var(--ha-space-0) var(--ha-space-4); } diff --git a/src/panels/lovelace/cards/energy/common/energy-chart-options.ts b/src/panels/lovelace/cards/energy/common/energy-chart-options.ts index a48ec81aee2b..6361ff7bb610 100644 --- a/src/panels/lovelace/cards/energy/common/energy-chart-options.ts +++ b/src/panels/lovelace/cards/energy/common/energy-chart-options.ts @@ -202,7 +202,7 @@ function formatTooltip( countNegative++; } } - return `${param.marker} ${filterXSS(param.seriesName!)}: ${value} ${unit}`; + return `${param.marker} ${filterXSS(param.seriesName!)}:
${value} ${unit}
`; }) .filter(Boolean); let footer = ""; diff --git a/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts index 8c1a7fec3bea..bfc2e170317a 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts @@ -157,7 +157,7 @@ export class HuiEnergyDevicesGraphCard this.hass.locale, params.value < 0.1 ? { maximumFractionDigits: 3 } : undefined )} kWh`; - return `${title}${params.marker} ${params.seriesName}: ${value}`; + return `${title}${params.marker} ${params.seriesName}:
${value}
`; } private _createOptions = memoizeOne( diff --git a/src/panels/lovelace/cards/energy/hui-energy-sankey-card.ts b/src/panels/lovelace/cards/energy/hui-energy-sankey-card.ts index 3b5f9f6e4cd4..bc189f28fb4d 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-sankey-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-sankey-card.ts @@ -402,7 +402,9 @@ class HuiEnergySankeyCard } private _valueFormatter = (value: number) => - `${formatNumber(value, this.hass.locale, value < 0.1 ? { maximumFractionDigits: 3 } : undefined)} kWh`; + `
+ ${formatNumber(value, this.hass.locale, value < 0.1 ? { maximumFractionDigits: 3 } : undefined)} + kWh
`; protected _groupByFloorAndArea(deviceNodes: Node[]) { const areas: Record = {