From 2984055021f2fbfb631cea8e0688b6391a7fadfe Mon Sep 17 00:00:00 2001
From: Tim Schmitz <104776863+schmitz-ilias@users.noreply.github.com>
Date: Wed, 13 Nov 2024 22:55:24 +0100
Subject: [PATCH] Calendar: fix css of recurrence inputs (42329) (#8372)

---
 .../default/tpl.recurrence_input.html         | 24 +++++++++----------
 .../legacy/Services/_component_calendar.scss  | 13 +++++++++-
 templates/default/delos.css                   |  9 +++++++
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/Services/Calendar/templates/default/tpl.recurrence_input.html b/Services/Calendar/templates/default/tpl.recurrence_input.html
index c79c930ab063..29fb073f31e8 100644
--- a/Services/Calendar/templates/default/tpl.recurrence_input.html
+++ b/Services/Calendar/templates/default/tpl.recurrence_input.html
@@ -1,4 +1,4 @@
-<div class="form-inline">
+<div class="form-inline calrecurrenceinput">
 	{FREQUENCE}
 	<!-- BEGIN daily_block -->
 	<div id="sub_DAILY_1" style="padding-left: 40px;">
@@ -21,8 +21,8 @@
 		<label class="control-label" for="count_WEEKLY">{TXT_EVERY}</label>
 		<input type="text"
 			   class="form-control"
-				name="count_WEEKLY" 
-				value="{COUNT_WEEKLY_VAL}" 
+				name="count_WEEKLY"
+				value="{COUNT_WEEKLY_VAL}"
 				size="2"
 				maxlength="3"
 				style="text-align:right" />
@@ -46,10 +46,10 @@
 	<div id="sub_MONTHLY_1" style="padding-left: 40px;">
 		<hr/>
 		<label class="control-label" for="count_MONTHLY">{TXT_EVERY}</label>
-		<input	type="text" 
+		<input	type="text"
 				class="form-control ilRight"
-				name="count_MONTHLY" 
-				value="{COUNT_MONTHLY_VAL}" 
+				name="count_MONTHLY"
+				value="{COUNT_MONTHLY_VAL}"
 				size="2"
 				maxlength="3" />
 		{TXT_MONTHLY_FREQ_UNIT}
@@ -75,7 +75,7 @@
 					value="2" /> {TXT_ON_THE}</label>
 		{SELECT_BYMONTHDAY}
 		{TXT_SUFFIX}
-		<hr/>	
+		<hr/>
 	</div>
 	<!-- END monthly_block -->
 	<!-- BEGIN yearly_block -->
@@ -83,9 +83,9 @@
 		<hr/>
 		<label class="control-label" for="count_YEARLY">{TXT_EVERY}</label>
 		<input	type="text"
-				class="form-control ilRight" 
-				name="count_YEARLY" 
-				value="{COUNT_YEARLY_VAL}" 
+				class="form-control ilRight"
+				name="count_YEARLY"
+				value="{COUNT_YEARLY_VAL}"
 				size="2"
 				maxlength="3" />
 		{TXT_YEARLY_FREQ_UNIT}
@@ -116,7 +116,7 @@
 		<hr/>
 	</div>
 	<!-- END yearly_block -->
-	
+
 	<!--  BEGIN until_selection_unlimited -->
 	<div id="sub_UNTIL_1" style="padding-left: 40px;">
 			<label class="control-label">
@@ -165,4 +165,4 @@
 				value="{VAL_FIXED_COUNT}" /> {TXT_FIXED_APPOINTMENTS}
 	</div>
 	<!-- END until_fixed -->
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/default/070-components/legacy/Services/_component_calendar.scss b/templates/default/070-components/legacy/Services/_component_calendar.scss
index 93a2f02c0a7f..e9111f8266e8 100644
--- a/templates/default/070-components/legacy/Services/_component_calendar.scss
+++ b/templates/default/070-components/legacy/Services/_component_calendar.scss
@@ -487,4 +487,15 @@ span.ilIcalIcon .btn {
 		padding-bottom: 4px;
 		padding-right: 4px;
 	}
-}
\ No newline at end of file
+}
+
+// Hacky solution to make legacy recurrence inputs look okay, #42329
+
+.calrecurrenceinput.form-inline label {
+	padding-right: unset;
+	vertical-align: unset;
+}
+
+.calrecurrenceinput.form-inline .form-control {
+	vertical-align: middle;
+}
diff --git a/templates/default/delos.css b/templates/default/delos.css
index 354d61f2fab2..5c09c85821e1 100644
--- a/templates/default/delos.css
+++ b/templates/default/delos.css
@@ -13840,6 +13840,15 @@ span.ilIcalIcon .btn {
   padding-right: 4px;
 }
 
+.calrecurrenceinput.form-inline label {
+  padding-right: unset;
+  vertical-align: unset;
+}
+
+.calrecurrenceinput.form-inline .form-control {
+  vertical-align: middle;
+}
+
 /* Services/Chart */
 td.legendColorBox, td.legendLabel {
   padding: 3px;