diff --git a/src/components/buttons/ha-call-service-button.ts b/src/components/buttons/ha-call-service-button.ts index 668cf4f205..d5c141005f 100644 --- a/src/components/buttons/ha-call-service-button.ts +++ b/src/components/buttons/ha-call-service-button.ts @@ -6,6 +6,7 @@ import { showConfirmationDialog } from "../../dialogs/generic/show-dialog-box"; import "./ha-progress-button"; import type { HomeAssistant } from "../../types"; import { fireEvent } from "../../common/dom/fire_event"; +import type { Appearance } from "../ha-button"; @customElement("ha-call-service-button") class HaCallServiceButton extends LitElement { @@ -25,12 +26,14 @@ class HaCallServiceButton extends LitElement { @property() public confirmation?; + @property() public appearance: Appearance = "plain"; + public render(): TemplateResult { return html` diff --git a/src/panels/config/integrations/integration-panels/zha/dialog-zha-manage-zigbee-device.ts b/src/panels/config/integrations/integration-panels/zha/dialog-zha-manage-zigbee-device.ts index c93b2051af..7af04b326f 100644 --- a/src/panels/config/integrations/integration-panels/zha/dialog-zha-manage-zigbee-device.ts +++ b/src/panels/config/integrations/integration-panels/zha/dialog-zha-manage-zigbee-device.ts @@ -220,6 +220,9 @@ class DialogZHAManageZigbeeDevice extends LitElement { .content { outline: none; + display: flex; + flex-direction: column; + gap: var(--ha-space-2); } @media all and (min-width: 600px) and (min-height: 501px) { diff --git a/src/panels/config/integrations/integration-panels/zha/zha-cluster-attributes.ts b/src/panels/config/integrations/integration-panels/zha/zha-cluster-attributes.ts index 5f49079063..002508ca52 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-cluster-attributes.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-cluster-attributes.ts @@ -117,15 +117,6 @@ export class ZHAClusterAttributes extends LitElement { >
- - ${this.hass!.localize( - "ui.panel.config.zha.cluster_attributes.read_zigbee_attribute" - )} - + + ${this.hass!.localize( + "ui.panel.config.zha.cluster_attributes.read_zigbee_attribute" + )} +
`; } @@ -230,6 +230,10 @@ export class ZHAClusterAttributes extends LitElement { return [ haStyle, css` + ha-card { + border: none; + } + ha-select { margin-top: 16px; } @@ -263,6 +267,12 @@ export class ZHAClusterAttributes extends LitElement { .header { flex-grow: 1; } + + .card-actions { + display: flex; + justify-content: flex-end; + gap: var(--ha-space-1); + } `, ]; } diff --git a/src/panels/config/integrations/integration-panels/zha/zha-cluster-commands.ts b/src/panels/config/integrations/integration-panels/zha/zha-cluster-commands.ts index 69cec55e10..475dedecb6 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-cluster-commands.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-cluster-commands.ts @@ -108,6 +108,7 @@ export class ZHAClusterCommands extends LitElement { service="issue_zigbee_cluster_command" .data=${this._issueClusterCommandServiceData} .disabled=${!this._canIssueCommand} + appearance="accent" > ${this.hass!.localize( "ui.panel.config.zha.cluster_commands.issue_zigbee_command" @@ -187,6 +188,10 @@ export class ZHAClusterCommands extends LitElement { return [ haStyle, css` + ha-card { + border: none; + } + ha-select { margin-top: 16px; } @@ -239,6 +244,11 @@ export class ZHAClusterCommands extends LitElement { padding-inline-start: initial; color: var(--primary-color); } + + .card-actions { + display: flex; + justify-content: flex-end; + } `, ]; } diff --git a/src/panels/config/integrations/integration-panels/zha/zha-device-binding.ts b/src/panels/config/integrations/integration-panels/zha/zha-device-binding.ts index b8bbb20a9f..f2e17027ed 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-device-binding.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-device-binding.ts @@ -60,6 +60,15 @@ export class ZHADeviceBindingControl extends LitElement {
+ + ${this.hass!.localize("ui.panel.config.zha.device_binding.unbind")} + ${this.hass!.localize("ui.panel.config.zha.device_binding.bind")} - - ${this.hass!.localize("ui.panel.config.zha.device_binding.unbind")} -
`; @@ -133,6 +135,10 @@ export class ZHADeviceBindingControl extends LitElement { width: 100%; } + .content { + padding-top: var(--ha-space-2); + } + .command-picker { align-items: center; padding-left: 28px; @@ -145,6 +151,11 @@ export class ZHADeviceBindingControl extends LitElement { .header { flex-grow: 1; } + .card-actions { + display: flex; + justify-content: flex-end; + gap: var(--ha-space-1); + } `, ]; } diff --git a/src/panels/config/integrations/integration-panels/zha/zha-group-binding.ts b/src/panels/config/integrations/integration-panels/zha/zha-group-binding.ts index bedccc1b0a..cf2ffab5a0 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-group-binding.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-group-binding.ts @@ -85,23 +85,24 @@ export class ZHAGroupBindingControl extends LitElement { >
- - ${this.hass!.localize( - "ui.panel.config.zha.group_binding.bind_button_label" - )} - - ${this.hass!.localize( "ui.panel.config.zha.group_binding.unbind_button_label" )} + + ${this.hass!.localize( + "ui.panel.config.zha.group_binding.bind_button_label" + )} +
@@ -205,6 +206,10 @@ export class ZHAGroupBindingControl extends LitElement { width: 100%; } + .content { + padding-top: var(--ha-space-2); + } + .command-picker { align-items: center; padding-left: 28px; @@ -225,6 +230,12 @@ export class ZHAGroupBindingControl extends LitElement { .sectionHeader { flex-grow: 1; } + + .card-actions { + display: flex; + justify-content: flex-end; + gap: var(--ha-space-1); + } `, ]; }