Skip to content

Commit

Permalink
Calendar: fix css of recurrence inputs (42329) (#8372)
Browse files Browse the repository at this point in the history
(cherry picked from commit 2984055)
(cherry picked from commit fc30f28)
  • Loading branch information
schmitz-ilias authored and Amstutz committed Nov 13, 2024
1 parent 70efa38 commit b57c131
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -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;">
Expand All @@ -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" />
Expand All @@ -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}
Expand All @@ -75,17 +75,17 @@
value="2" /> {TXT_ON_THE}</label>
{SELECT_BYMONTHDAY}
{TXT_SUFFIX}
<hr/>
<hr/>
</div>
<!-- END monthly_block -->
<!-- BEGIN yearly_block -->
<div id="sub_YEARLY_1" style="padding-left: 40px;">
<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}
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -165,4 +165,4 @@
value="{VAL_FIXED_COUNT}" /> {TXT_FIXED_APPOINTMENTS}
</div>
<!-- END until_fixed -->
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -487,4 +487,15 @@ span.ilIcalIcon .btn {
padding-bottom: 4px;
padding-right: 4px;
}
}
}

// 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;
}
9 changes: 9 additions & 0 deletions templates/default/delos.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b57c131

Please sign in to comment.