From 5de8d07ce0a3a949fb73a82707a49de6391f9a56 Mon Sep 17 00:00:00 2001 From: Wendelin <12148533+wendevlin@users.noreply.github.com> Date: Mon, 4 Aug 2025 14:18:31 +0200 Subject: [PATCH] Fix ha-buttons (#26373) * Fix ha-button supervisor network * Fix button appearance for entity row * Fix logs button menu mobile width * Fix new logs indicator --- .../src/components/landing-page-logs.ts | 27 ++++++++----------- src/panels/config/logs/error-log-card.ts | 1 + src/panels/config/logs/ha-config-logs.ts | 15 +++++++++++ .../config/network/supervisor-network.ts | 6 ++--- .../entity-rows/hui-scene-entity-row.ts | 2 +- .../entity-rows/hui-script-entity-row.ts | 9 ++++--- 6 files changed, 36 insertions(+), 24 deletions(-) diff --git a/landing-page/src/components/landing-page-logs.ts b/landing-page/src/components/landing-page-logs.ts index 5017cc7f1c..a8c4016eed 100644 --- a/landing-page/src/components/landing-page-logs.ts +++ b/landing-page/src/components/landing-page-logs.ts @@ -3,26 +3,26 @@ import { mdiArrowCollapseDown, mdiDownload } from "@mdi/js"; // eslint-disable-next-line import/extensions import { IntersectionController } from "@lit-labs/observers/intersection-controller.js"; import { LitElement, type PropertyValues, css, html, nothing } from "lit"; -import { classMap } from "lit/directives/class-map"; import { customElement, property, query, state } from "lit/decorators"; +import { classMap } from "lit/directives/class-map"; +import { fireEvent } from "../../../src/common/dom/fire_event"; import type { LandingPageKeys, LocalizeFunc, } from "../../../src/common/translations/localize"; +import { waitForSeconds } from "../../../src/common/util/wait"; +import "../../../src/components/ha-alert"; +import "../../../src/components/ha-ansi-to-html"; +import type { HaAnsiToHtml } from "../../../src/components/ha-ansi-to-html"; import "../../../src/components/ha-button"; import "../../../src/components/ha-icon-button"; import "../../../src/components/ha-svg-icon"; -import "../../../src/components/ha-ansi-to-html"; -import "../../../src/components/ha-alert"; -import type { HaAnsiToHtml } from "../../../src/components/ha-ansi-to-html"; +import { fileDownload } from "../../../src/util/file_download"; import { getObserverLogs, downloadUrl as observerLogsDownloadUrl, } from "../data/observer"; -import { fireEvent } from "../../../src/common/dom/fire_event"; -import { fileDownload } from "../../../src/util/file_download"; import { getSupervisorLogs, getSupervisorLogsFollow } from "../data/supervisor"; -import { waitForSeconds } from "../../../src/common/util/wait"; import { ASSUME_CORE_START_SECONDS } from "../ha-landing-page"; const ERROR_CHECK = /^[\d\s-:]+(ERROR|CRITICAL)(.*)/gm; @@ -108,6 +108,8 @@ class LandingPageLogs extends LitElement { !this._scrolledToBottomController.value) || false, })}" + size="small" + appearance="filled" @click=${this._scrollToBottom} > @@ -309,21 +311,14 @@ class LandingPageLogs extends LitElement { } .new-logs-indicator { - --mdc-theme-primary: var(--text-primary-color); - overflow: hidden; position: absolute; - bottom: 0; - left: 0; - right: 0; + bottom: 4px; + left: 4px; height: 0; - background-color: var(--primary-color); - border-radius: 8px; transition: height 0.4s ease-out; display: flex; - justify-content: space-between; - align-items: center; } .new-logs-indicator.visible { diff --git a/src/panels/config/logs/error-log-card.ts b/src/panels/config/logs/error-log-card.ts index eb912f8a1a..34f8190b82 100644 --- a/src/panels/config/logs/error-log-card.ts +++ b/src/panels/config/logs/error-log-card.ts @@ -825,6 +825,7 @@ class ErrorLogCard extends LitElement { overflow: hidden; position: absolute; bottom: 4px; + left: 4px; height: 0; transition: height 0.4s ease-out; } diff --git a/src/panels/config/logs/ha-config-logs.ts b/src/panels/config/logs/ha-config-logs.ts index 03e2d62fdd..142746de1f 100644 --- a/src/panels/config/logs/ha-config-logs.ts +++ b/src/panels/config/logs/ha-config-logs.ts @@ -250,6 +250,21 @@ export class HaConfigLogs extends LitElement { .content { direction: ltr; } + @media all and (max-width: 870px) { + ha-button-menu { + max-width: 50%; + } + ha-button { + max-width: 100%; + } + ha-button::part(label) { + overflow: hidden; + white-space: nowrap; + } + } + ha-list-item[selected] { + color: var(--primary-color); + } `, ]; } diff --git a/src/panels/config/network/supervisor-network.ts b/src/panels/config/network/supervisor-network.ts index ceb7622af6..f7c5044f2f 100644 --- a/src/panels/config/network/supervisor-network.ts +++ b/src/panels/config/network/supervisor-network.ts @@ -260,9 +260,6 @@ export class HassioNetwork extends LitElement { : nothing}
- - ${this.hass.localize("ui.panel.config.network.supervisor.reset")} - ${this.hass.localize("ui.common.save")} + + ${this.hass.localize("ui.panel.config.network.supervisor.reset")} +
`; } diff --git a/src/panels/lovelace/entity-rows/hui-scene-entity-row.ts b/src/panels/lovelace/entity-rows/hui-scene-entity-row.ts index 8de8d6a0d5..ef8f56e608 100644 --- a/src/panels/lovelace/entity-rows/hui-scene-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-scene-entity-row.ts @@ -47,7 +47,7 @@ class HuiSceneEntityRow extends LitElement implements LovelaceRow { return html` ${stateObj.state === "on" ? html` ${stateObj.attributes.mode !== "single" && @@ -61,10 +62,10 @@ class HuiScriptEntityRow extends LitElement implements LovelaceRow { }) : this.hass.localize("ui.card.script.cancel")} ` - : ""} + : nothing} ${stateObj.state === "off" || stateObj.attributes.max ? html`` - : ""} + : nothing} `; }