deblan/forms
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #424 from nextcloud/fix/submission_header

Browse source 
Fix linebreak in description
This commit is contained in:
Jan C. Borchardt 2020-06-03 16:57:10 +02:00 committed by GitHub
parent 04c45fa676 4d8022f629
commit cbd80c504d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/views/Create.vue
View file

@ -71,7 +71,7 @@
@keydown="autoSizeDescription" @keydown="autoSizeDescription"
@keyup="onDescChange" /> @keyup="onDescChange" />
<!-- Only visible if at least one question is marked as mandatory--> <!-- Only visible if at least one question is marked as mandatory-->
<p v-if="mandatoryUsed" class="form-desc info-mandatory"> <p v-if="mandatoryUsed" class="info-mandatory">
* {{ t('forms', 'Mandatory questions') }} * {{ t('forms', 'Mandatory questions') }}
</p> </p>
</header> </header>
@ -445,7 +445,8 @@ export default {
} }
.form-title, .form-title,
.form-desc { .form-desc,
.info-mandatory {
width: 100%; width: 100%;
padding: 0 16px; padding: 0 16px;
border: none; border: none;
@ -464,11 +465,15 @@ export default {
} }
.form-desc { .form-desc {
font-size: 100%; font-size: 100%;
line-height: 150%;
padding-bottom: 20px; padding-bottom: 20px;
resize: none; resize: none;
} }
.info-mandatory { .info-mandatory {
font-size: 100%;
padding-bottom: 20px;
resize: none;
color: var(--color-text-maxcontrast); color: var(--color-text-maxcontrast);
} }
} }

16
src/views/Submit.vue
View file

@ -28,11 +28,11 @@
<h2 class="form-title"> <h2 class="form-title">
{{ formTitle }} {{ formTitle }}
</h2> </h2>
<p v-if="!loading && !success" class="form-desc"> <!-- Do not wrap the following line between tags! `white-space:pre-line` respects `\n` but would produce additional empty first line -->
{{ form.description }} <!-- eslint-disable-next-line -->
</p> <p v-if="!loading && !success" class="form-desc">{{ form.description }}</p>
<!-- Only visible if at least one question is marked as mandatory--> <!-- Only visible if at least one question is marked as mandatory-->
<p v-if="mandatoryUsed && !loading && !success" class="form-desc info-mandatory"> <p v-if="mandatoryUsed && !loading && !success" class="info-mandatory">
* {{ t('forms', 'Mandatory questions') }} * {{ t('forms', 'Mandatory questions') }}
</p> </p>
</header> </header>
@ -203,7 +203,8 @@ export default {
margin-bottom: 24px; margin-bottom: 24px;
.form-title, .form-title,
.form-desc { .form-desc,
.info-mandatory {
width: 100%; width: 100%;
padding: 0 16px; padding: 0 16px;
border: none; border: none;
@ -221,11 +222,16 @@ export default {
} }
.form-desc { .form-desc {
font-size: 100%; font-size: 100%;
line-height: 150%;
padding-bottom: 20px; padding-bottom: 20px;
resize: none; resize: none;
white-space: pre-line;
} }
.info-mandatory { .info-mandatory {
font-size: 100%;
padding-bottom: 20px;
resize: none;
color: var(--color-text-maxcontrast); color: var(--color-text-maxcontrast);
} }
} }