Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable4] fix: add icon to title of required questions in edit mode #2147

Merged
merged 1 commit into from
May 8, 2024
Merged

[stable4] fix: add icon to title of required questions in edit mode #2147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/components/Icons/IconOverlay.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<template>
<span>
<slot />
<span class="icon-overlay">
<slot name="overlay" />
</span>
</span>
</template>

<script setup>
</script>

<style scoped>
.icon-overlay-wrapper {
position: relative;
}

.icon-overlay {
position: absolute;
inset-inline-start: 2px;
inset-block-start: 2px;

transform: scale(0.7);
}
</style>
20 changes: 17 additions & 3 deletions src/components/Questions/Question.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<!-- Header -->
<div class="question__header">
<div class="question__header__title">
<input v-if="!readOnly || !questionValid"
<input v-if="!readOnly"
:placeholder="titlePlaceholder"
:aria-label="t('forms', 'Title of question number {index}', {index})"
:value="text"
Expand Down Expand Up @@ -87,6 +87,14 @@
:force-menu="true"
placement="bottom-end"
class="question__header__title__menu">
<template v-if="isRequired" #icon>
<IconOverlay>
<template #overlay>
<IconAsterisk :size="20" />
</template>
<IconDotsHorizontal :size="20" />
</IconOverlay>
</template>
<NcActionCheckbox :checked="isRequired"
@update:checked="onRequiredChange">
<!-- TRANSLATORS Making this question necessary to be answered when submitting to a form -->
Expand Down Expand Up @@ -118,8 +126,8 @@
</NcActionButton>
</NcActions>
</div>
<div v-if="hasDescription || !readOnly || !questionValid" class="question__header__description">
<textarea v-if="!readOnly || !questionValid"
<div v-if="hasDescription || !readOnly" class="question__header__description">
<textarea v-if="!readOnly"
ref="description"
dir="auto"
:value="description"
Expand Down Expand Up @@ -147,10 +155,13 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import IconAlertCircleOutline from 'vue-material-design-icons/AlertCircleOutline.vue'
import IconArrowDown from 'vue-material-design-icons/ArrowDown.vue'
import IconArrowUp from 'vue-material-design-icons/ArrowUp.vue'
import IconAsterisk from 'vue-material-design-icons/Asterisk.vue'
import IconContentCopy from 'vue-material-design-icons/ContentCopy.vue'
import IconDelete from 'vue-material-design-icons/Delete.vue'
import IconDragHorizontalVariant from 'vue-material-design-icons/DragHorizontalVariant.vue'
import IconDotsHorizontal from 'vue-material-design-icons/DotsHorizontal.vue'
import IconIdentifier from 'vue-material-design-icons/Identifier.vue'
import IconOverlay from '../Icons/IconOverlay.vue'

export default {
name: 'Question',
Expand All @@ -159,10 +170,13 @@ export default {
IconAlertCircleOutline,
IconArrowDown,
IconArrowUp,
IconAsterisk,
IconContentCopy,
IconDelete,
IconDragHorizontalVariant,
IconDotsHorizontal,
IconIdentifier,
IconOverlay,
NcActions,
NcActionButton,
NcActionCheckbox,
Expand Down
Loading