fix problems from !4499, fixes #5820

Closes #5820

Merge request studip/studip!4778

3 files changed, 38 insertions, 17 deletions

diff --git a/resources/assets/stylesheets/scss/forms.scss b/resources/assets/stylesheets/scss/forms.scss
index 1545c6a..083d289 100644
--- a/resources/assets/stylesheets/scss/forms.scss
+++ b/resources/assets/stylesheets/scss/forms.scss
@@ -159,13 +159,33 @@ form.default {
 
     /* we have to use specific css selectors, otherwise the settings are
        overwritten by other rules  */
-    label.col-1, label.col-2, label.col-3, label.col-4, label.col-5,
-    div.col-1, div.col-2, div.col-3, div.col-4, div.col-5,
-    section.col-1, section.col-2, section.col-3, section.col-4, section.col-5 {
-        display: inline-block;
-        padding-right: 1em;
-        vertical-align: top;
-        word-break: break-all;
+    @for $i from 1 through 5 {
+        label,
+        div,
+        section {
+            &.col-#{$i} {
+                display: inline-block;
+                padding-right: 1em;
+                vertical-align: top;
+                word-break: break-all;
+
+                .studip-v-select {
+                    .vs__dropdown-toggle {
+                        padding-bottom: 2px;
+                    }
+                    margin-top: 3px;
+                }
+            }
+        }
+
+        div,
+        section {
+            &.col-#{$i} {
+                label {
+                    margin-bottom: 0;
+                }
+            }
+        }
     }
 
     label,
@@ -188,14 +208,6 @@ form.default {
         }
     }
 
-    div.col-1,
-    div.col-2,
-    div.col-3,
-    div.col-4,
-    div.col-5 {
-        margin-top: 2ex;
-    }
-
     fieldset:not(.undecorated) {
         box-sizing: border-box;
         border: solid 1px var(--color--fieldset-border);
diff --git a/resources/vue/apps/ConsultationCreator.vue b/resources/vue/apps/ConsultationCreator.vue
index ede8387..908f865 100644
--- a/resources/vue/apps/ConsultationCreator.vue
+++ b/resources/vue/apps/ConsultationCreator.vue
@@ -160,7 +160,6 @@
             <template v-if="withResponsible.users">
                 <label for="responsible-users">
                     {{ $gettext('Durchführende Personen') }}
-
                 </label>
                 <StudipSelect
                     id="responsible-users"
diff --git a/resources/vue/components/StudipSelect.vue b/resources/vue/components/StudipSelect.vue
index dca450a..336b977 100644
--- a/resources/vue/components/StudipSelect.vue
+++ b/resources/vue/components/StudipSelect.vue
@@ -1,6 +1,6 @@
 <template>
     <vSelect ref="select"
-             v-bind="{...$props, ...$attrs}"
+             v-bind="{...$props, ...selectAttrs}"
              :model-value="modelValue"
              @update:modelValue="value => updateValue(value)"
              :calculate-position="withPopper"
@@ -39,6 +39,16 @@ export default {
             default: '12em'
         },
     },
+    computed: {
+        selectAttrs() {
+            const attrs = {...this.$attrs};
+            if (attrs.id !== undefined) {
+                attrs.inputId = attrs.id;
+                delete attrs.id;
+            }
+            return attrs;
+        }
+    },
     methods: {
         updateValue(val) {
             this.$emit('update:modelValue', val)