Ehrenamt/ff-admin
2
0
Fork 0
Code Issues 13 Pull requests Projects Releases 30 Packages Wiki Activity Actions

Merge branch 'develop' into milestone/ff-admin-unit

Browse source 
# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
Julian Krauser 2025-07-25 09:29:01 +02:00
commit 0b16599d2a
13 changed files with 198 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/views/admin/club/protocol/ProtocolDecisions.vue
View file

@ -24,7 +24,7 @@
type="text"
name="title"
id="title"
placeholder="Entscheidung"
placeholder="Beschluss"
autocomplete="off"
v-model="item.topic"
@keyup.prevent
@ -57,7 +57,7 @@
<QuillEditor
id="top"
theme="snow"
placeholder="Entscheidung Inhalt..."
placeholder="Beschluss Inhalt..."
style="height: 250px; max-height: 250px; min-height: 250px"
contentType="html"
:toolbar="toolbarOptions"

4
src/views/admin/club/protocol/ProtocolVoting.vue
View file

@ -57,8 +57,8 @@
<QuillEditor
id="top"
theme="snow"
placeholder="Entscheidung Inhalt..."
style="height: 100px; max-height: 100px; min-height: 100px"
placeholder="Abstimmung Inhalt..."
style="height: 150px; max-height: 150px; min-height: 150px"
contentType="html"
:toolbar="toolbarOptions"
v-model:content="item.context"