From c6efa1127fab001e28481bec78c3c51a497667fd Mon Sep 17 00:00:00 2001 From: Wendelin <12148533+wendevlin@users.noreply.github.com> Date: Fri, 1 Aug 2025 13:13:42 +0200 Subject: [PATCH] Fix dialog secondary button design (#26344) --- src/panels/calendar/dialog-calendar-event-editor.ts | 5 +++-- .../backup/dialogs/dialog-local-backup-location.ts | 3 ++- .../zha/dialog-zha-change-channel.ts | 13 +++++++------ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/panels/calendar/dialog-calendar-event-editor.ts b/src/panels/calendar/dialog-calendar-event-editor.ts index 797c61f462..9dd4521dbe 100644 --- a/src/panels/calendar/dialog-calendar-event-editor.ts +++ b/src/panels/calendar/dialog-calendar-event-editor.ts @@ -1,4 +1,3 @@ -import { formatInTimeZone, toDate } from "date-fns-tz"; import { addDays, addHours, @@ -6,6 +5,7 @@ import { differenceInMilliseconds, startOfHour, } from "date-fns"; +import { formatInTimeZone, toDate } from "date-fns-tz"; import type { HassEntity } from "home-assistant-js-websocket"; import type { CSSResultGroup } from "lit"; import { LitElement, css, html, nothing } from "lit"; @@ -18,11 +18,11 @@ import { supportsFeature } from "../../common/entity/supports-feature"; import { isDate } from "../../common/string/is_date"; import "../../components/entity/ha-entity-picker"; import "../../components/ha-alert"; +import "../../components/ha-button"; import "../../components/ha-date-input"; import { createCloseHeading } from "../../components/ha-dialog"; import "../../components/ha-formfield"; import "../../components/ha-switch"; -import "../../components/ha-button"; import "../../components/ha-textarea"; import "../../components/ha-textfield"; import "../../components/ha-time-input"; @@ -282,6 +282,7 @@ class DialogCalendarEventEditor extends LitElement { ? html` diff --git a/src/panels/config/integrations/integration-panels/zha/dialog-zha-change-channel.ts b/src/panels/config/integrations/integration-panels/zha/dialog-zha-change-channel.ts index e0833ebcc6..58b1a13dd8 100644 --- a/src/panels/config/integrations/integration-panels/zha/dialog-zha-change-channel.ts +++ b/src/panels/config/integrations/integration-panels/zha/dialog-zha-change-channel.ts @@ -3,16 +3,16 @@ import { html, LitElement, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../../../common/dom/fire_event"; import { stopPropagation } from "../../../../../common/dom/stop_propagation"; -import type { HassDialog } from "../../../../../dialogs/make-dialog-manager"; -import { changeZHANetworkChannel } from "../../../../../data/zha"; -import { showAlertDialog } from "../../../../../dialogs/generic/show-dialog-box"; -import { createCloseHeading } from "../../../../../components/ha-dialog"; -import type { HomeAssistant } from "../../../../../types"; import "../../../../../components/buttons/ha-progress-button"; import "../../../../../components/ha-alert"; import "../../../../../components/ha-button"; -import "../../../../../components/ha-select"; +import { createCloseHeading } from "../../../../../components/ha-dialog"; import "../../../../../components/ha-list-item"; +import "../../../../../components/ha-select"; +import { changeZHANetworkChannel } from "../../../../../data/zha"; +import { showAlertDialog } from "../../../../../dialogs/generic/show-dialog-box"; +import type { HassDialog } from "../../../../../dialogs/make-dialog-manager"; +import type { HomeAssistant } from "../../../../../types"; import type { ZHAChangeChannelDialogParams } from "./show-dialog-zha-change-channel"; const VALID_CHANNELS = [ @@ -128,6 +128,7 @@ class DialogZHAChangeChannel extends LitElement implements HassDialog { ${this.hass.localize("ui.common.cancel")}