Fix search form label alignment

matthiask · Jan 24, 2025 · ae9f7f5 · ae9f7f5
1 parent 106e939
commit ae9f7f5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/workbench/logbook/forms.py b/workbench/logbook/forms.py
@@ -86,7 +86,7 @@ class LoggedHoursSearchForm(Form):
     )
     date_from = forms.DateField(widget=DateInput, required=False, label="")
     date_until = forms.DateField(
-        widget=DateInput, required=False, label=mark_safe("&ndash;&nbsp;")
+        widget=DateInput, required=False, label=mark_safe("&ndash;")
     )
     service = forms.ModelChoiceField(
         queryset=Service.objects.all(),
@@ -230,7 +230,7 @@ class LoggedCostSearchForm(Form):
     expenses = forms.BooleanField(required=False, label=_("expenses"))
     date_from = forms.DateField(widget=DateInput, required=False, label="")
     date_until = forms.DateField(
-        widget=DateInput, required=False, label=mark_safe("&ndash;&nbsp;")
+        widget=DateInput, required=False, label=mark_safe("&ndash;")
     )
     service = forms.ModelChoiceField(
         queryset=Service.objects.all(),

diff --git a/workbench/static/workbench/main.scss b/workbench/static/workbench/main.scss
@@ -140,10 +140,18 @@ tbody th > a {
   align-items: flex-start;
   margin-bottom: 1rem;
 }
+
 .form-search input,
 .form-search select {
   max-width: 10em;
 }
+
+.form-search .form-group {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+
 .form-search > * {
   margin-left: 0.25rem;
 }

diff --git a/workbench/templates/logbook/loggedhours_list.html b/workbench/templates/logbook/loggedhours_list.html
@@ -1,5 +1,7 @@
 {% extends "generic/object_list.html" %}
+
 {% load django_bootstrap5 i18n workbench %}
+
 {% block search-form-buttons %}
   {% if request.GET and request.user.features.CONTROLLING %}
     <a href="{% querystring export='xlsx' %}" class="btn btn-primary">