From 76a682fa28353f19d4e5e9205a0d3869f0178d54 Mon Sep 17 00:00:00 2001
From: Philip Allgaier <mail@spacegaier.de>
Date: Mon, 5 Dec 2022 14:26:11 +0100
Subject: [PATCH] Ensure calendar event texts are aligned (#14521)

---
 src/panels/calendar/dialog-calendar-event-detail.ts | 10 +++++++---
 src/panels/calendar/dialog-calendar-event-editor.ts |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/panels/calendar/dialog-calendar-event-detail.ts b/src/panels/calendar/dialog-calendar-event-detail.ts
index cf3db9adb5..e5a6aaca00 100644
--- a/src/panels/calendar/dialog-calendar-event-detail.ts
+++ b/src/panels/calendar/dialog-calendar-event-detail.ts
@@ -8,6 +8,7 @@ import { formatDate } from "../../common/datetime/format_date";
 import { formatDateTime } from "../../common/datetime/format_date_time";
 import { formatTime } from "../../common/datetime/format_time";
 import { fireEvent } from "../../common/dom/fire_event";
+import { capitalizeFirstLetter } from "../../common/string/capitalize-first-letter";
 import { isDate } from "../../common/string/is_date";
 import "../../components/entity/state-info";
 import "../../components/ha-date-input";
@@ -108,7 +109,8 @@ class DialogCalendarEventDetail extends LitElement {
                 ${this.hass.localize("ui.components.calendar.event.delete")}
               </mwc-button>
             `
-          : ""}${this._params.canEdit
+          : ""}
+        ${this._params.canEdit
           ? html`<mwc-button
               slot="primaryAction"
               @click=${this._editEvent}
@@ -125,7 +127,9 @@ class DialogCalendarEventDetail extends LitElement {
     // TODO: Make sure this handles translations
     try {
       const readableText =
-        value === "" ? "" : RRule.fromString(`RRULE:${value}`).toText();
+        value === ""
+          ? ""
+          : capitalizeFirstLetter(RRule.fromString(`RRULE:${value}`).toText());
       return html`<div id="text">${readableText}</div>`;
     } catch (e) {
       return "";
@@ -227,7 +231,7 @@ class DialogCalendarEventDetail extends LitElement {
         ha-svg-icon {
           width: 40px;
           margin-right: 8px;
-          margin-inline-end: 8px;
+          margin-inline-end: 16px;
           margin-inline-start: initial;
           direction: var(--direction);
           vertical-align: top;
diff --git a/src/panels/calendar/dialog-calendar-event-editor.ts b/src/panels/calendar/dialog-calendar-event-editor.ts
index 0997260929..6c29ab0d80 100644
--- a/src/panels/calendar/dialog-calendar-event-editor.ts
+++ b/src/panels/calendar/dialog-calendar-event-editor.ts
@@ -440,7 +440,7 @@ class DialogCalendarEventEditor extends LitElement {
         ha-svg-icon {
           width: 40px;
           margin-right: 8px;
-          margin-inline-end: 8px;
+          margin-inline-end: 16px;
           margin-inline-start: initial;
           direction: var(--direction);
           vertical-align: top;