From 5227541f72777b284a1a785ad5fb3eb24553772e Mon Sep 17 00:00:00 2001
From: schelv <13403863+schelv@users.noreply.github.com>
Date: Sat, 20 Jul 2024 12:35:00 +0200
Subject: [PATCH] improve label appearance

---
 src/components/ha-base-time-input.ts | 239 ++++++++++++++-------------
 1 file changed, 122 insertions(+), 117 deletions(-)

diff --git a/src/components/ha-base-time-input.ts b/src/components/ha-base-time-input.ts
index 6a80b2f4f0f2..7c9e75035229 100644
--- a/src/components/ha-base-time-input.ts
+++ b/src/components/ha-base-time-input.ts
@@ -133,138 +133,140 @@ export class HaBaseTimeInput extends LitElement {
       ${this.label
         ? html`<label>${this.label}${this.required ? " *" : ""}</label>`
         : ""}
-      <div class="time-input-wrap">
-        ${this.enableDay
-          ? html`
-              <ha-textfield
-                id="day"
+      <div class="time-input-wrap-wrap">
+        <div class="time-input-wrap">
+          ${this.enableDay
+            ? html`
+                <ha-textfield
+                  id="day"
+                  type="number"
+                  inputmode="numeric"
+                  .value=${this.days.toFixed()}
+                  .label=${this.dayLabel}
+                  name="days"
+                  @change=${this._valueChanged}
+                  @focusin=${this._onFocus}
+                  no-spinner
+                  .required=${this.required}
+                  .autoValidate=${this.autoValidate}
+                  min="0"
+                  .disabled=${this.disabled}
+                  suffix=":"
+                  class="hasSuffix"
+                >
+                </ha-textfield>
+              `
+            : ""}
+
+          <ha-textfield
+            id="hour"
+            type="number"
+            inputmode="numeric"
+            .value=${this.hours.toFixed()}
+            .label=${this.hourLabel}
+            name="hours"
+            @change=${this._valueChanged}
+            @focusin=${this._onFocus}
+            no-spinner
+            .required=${this.required}
+            .autoValidate=${this.autoValidate}
+            maxlength="2"
+            max=${ifDefined(this._hourMax)}
+            min="0"
+            .disabled=${this.disabled}
+            suffix=":"
+            class="hasSuffix"
+          >
+          </ha-textfield>
+          <ha-textfield
+            id="min"
+            type="number"
+            inputmode="numeric"
+            .value=${this._formatValue(this.minutes)}
+            .label=${this.minLabel}
+            @change=${this._valueChanged}
+            @focusin=${this._onFocus}
+            name="minutes"
+            no-spinner
+            .required=${this.required}
+            .autoValidate=${this.autoValidate}
+            maxlength="2"
+            max="59"
+            min="0"
+            .disabled=${this.disabled}
+            .suffix=${this.enableSecond ? ":" : ""}
+            class=${this.enableSecond ? "has-suffix" : ""}
+          >
+          </ha-textfield>
+          ${this.enableSecond
+            ? html`<ha-textfield
+                id="sec"
                 type="number"
                 inputmode="numeric"
-                .value=${this.days.toFixed()}
-                .label=${this.dayLabel}
-                name="days"
+                .value=${this._formatValue(this.seconds)}
+                .label=${this.secLabel}
                 @change=${this._valueChanged}
                 @focusin=${this._onFocus}
+                name="seconds"
                 no-spinner
                 .required=${this.required}
                 .autoValidate=${this.autoValidate}
+                maxlength="2"
+                max="59"
                 min="0"
                 .disabled=${this.disabled}
-                suffix=":"
-                class="hasSuffix"
+                .suffix=${this.enableMillisecond ? ":" : ""}
+                class=${this.enableMillisecond ? "has-suffix" : ""}
               >
-              </ha-textfield>
-            `
-          : ""}
-
-        <ha-textfield
-          id="hour"
-          type="number"
-          inputmode="numeric"
-          .value=${this.hours.toFixed()}
-          .label=${this.hourLabel}
-          name="hours"
-          @change=${this._valueChanged}
-          @focusin=${this._onFocus}
-          no-spinner
-          .required=${this.required}
-          .autoValidate=${this.autoValidate}
-          maxlength="2"
-          max=${ifDefined(this._hourMax)}
-          min="0"
-          .disabled=${this.disabled}
-          suffix=":"
-          class="hasSuffix"
-        >
-        </ha-textfield>
-        <ha-textfield
-          id="min"
-          type="number"
-          inputmode="numeric"
-          .value=${this._formatValue(this.minutes)}
-          .label=${this.minLabel}
-          @change=${this._valueChanged}
-          @focusin=${this._onFocus}
-          name="minutes"
-          no-spinner
-          .required=${this.required}
-          .autoValidate=${this.autoValidate}
-          maxlength="2"
-          max="59"
-          min="0"
-          .disabled=${this.disabled}
-          .suffix=${this.enableSecond ? ":" : ""}
-          class=${this.enableSecond ? "has-suffix" : ""}
-        >
-        </ha-textfield>
-        ${this.enableSecond
-          ? html`<ha-textfield
-              id="sec"
-              type="number"
-              inputmode="numeric"
-              .value=${this._formatValue(this.seconds)}
-              .label=${this.secLabel}
-              @change=${this._valueChanged}
-              @focusin=${this._onFocus}
-              name="seconds"
-              no-spinner
-              .required=${this.required}
-              .autoValidate=${this.autoValidate}
-              maxlength="2"
-              max="59"
-              min="0"
-              .disabled=${this.disabled}
-              .suffix=${this.enableMillisecond ? ":" : ""}
-              class=${this.enableMillisecond ? "has-suffix" : ""}
-            >
-            </ha-textfield>`
-          : ""}
-        ${this.enableMillisecond
-          ? html`<ha-textfield
-              id="millisec"
-              type="number"
-              .value=${this._formatValue(this.milliseconds, 3)}
-              .label=${this.millisecLabel}
-              @change=${this._valueChanged}
-              @focusin=${this._onFocus}
-              name="milliseconds"
-              no-spinner
+              </ha-textfield>`
+            : ""}
+          ${this.enableMillisecond
+            ? html`<ha-textfield
+                id="millisec"
+                type="number"
+                .value=${this._formatValue(this.milliseconds, 3)}
+                .label=${this.millisecLabel}
+                @change=${this._valueChanged}
+                @focusin=${this._onFocus}
+                name="milliseconds"
+                no-spinner
+                .required=${this.required}
+                .autoValidate=${this.autoValidate}
+                maxlength="3"
+                max="999"
+                min="0"
+                .disabled=${this.disabled}
+              >
+              </ha-textfield>`
+            : ""}
+          ${this.clearable && !this.required && !this.disabled
+            ? html`<ha-icon-button
+                label="clear"
+                @click=${this._clearValue}
+                .path=${mdiClose}
+              ></ha-icon-button>`
+            : nothing}
+        </div>
+
+        ${this.format === 24
+          ? ""
+          : html`<ha-select
               .required=${this.required}
-              .autoValidate=${this.autoValidate}
-              maxlength="3"
-              max="999"
-              min="0"
+              .value=${this.amPm}
               .disabled=${this.disabled}
+              name="amPm"
+              naturalMenuWidth
+              fixedMenuPosition
+              @selected=${this._valueChanged}
+              @closed=${stopPropagation}
             >
-            </ha-textfield>`
+              <mwc-list-item value="AM">AM</mwc-list-item>
+              <mwc-list-item value="PM">PM</mwc-list-item>
+            </ha-select>`}
+        ${this.helper
+          ? html`<ha-input-helper-text>${this.helper}</ha-input-helper-text>`
           : ""}
-        ${this.clearable && !this.required && !this.disabled
-          ? html`<ha-icon-button
-              label="clear"
-              @click=${this._clearValue}
-              .path=${mdiClose}
-            ></ha-icon-button>`
-          : nothing}
       </div>
-
-      ${this.format === 24
-        ? ""
-        : html`<ha-select
-            .required=${this.required}
-            .value=${this.amPm}
-            .disabled=${this.disabled}
-            name="amPm"
-            naturalMenuWidth
-            fixedMenuPosition
-            @selected=${this._valueChanged}
-            @closed=${stopPropagation}
-          >
-            <mwc-list-item value="AM">AM</mwc-list-item>
-            <mwc-list-item value="PM">PM</mwc-list-item>
-          </ha-select>`}
-      ${this.helper
-        ? html`<ha-input-helper-text>${this.helper}</ha-input-helper-text>`
-        : ""}
     `;
   }
 
@@ -322,6 +324,9 @@ export class HaBaseTimeInput extends LitElement {
       position: relative;
     }
     :host {
+      display: block;
+    }
+    .time-input-wrap-wrap {
       display: flex;
     }
     .time-input-wrap {