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

748 redimensionnement des boutons consulter le rapport et annoter laudit #756

Merged
merged 4 commits into from
Jul 11, 2024
Merged

748 redimensionnement des boutons consulter le rapport et annoter laudit #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
276e56a
SaveIndicator: add min-width to avoid resizing on save
yaaax Jul 5, 2024
af1836c
Format code (indentation)
yaaax Jul 5, 2024
8816a55
Improve notes sidebar title layout
yaaax Jul 5, 2024
12ddee4
Prevent using 2 lines of text for sub-header
yaaax Jul 5, 2024
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
27 changes: 21 additions & 6 deletions confiture-web-app/src/components/audit/AuditGenerationHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ onMounted(() => {
:disabled="isOffline"
>
<ul role="list" class="fr-p-0 fr-m-0 dropdown-list">
<li class="dropdown-item mobile-dropdown-item">
<li class="dropdown-item notes-item mobile-dropdown-item">
<button
class="fr-btn fr-btn--tertiary-no-outline fr-btn--icon-left fr-icon-draft-line"
:disabled="isOffline"
Expand Down Expand Up @@ -604,15 +604,30 @@ onMounted(() => {
display: none;
}

@media (width < 62rem) {
.mobile-dropdown-item {
@media (width < 83rem) {
.report-item.mobile-dropdown-item {
display: block;
}

.settings-item:not(.mobile-dropdown-item),
.notes-item:not(.mobile-dropdown-item),
.report-item:not(.mobile-dropdown-item) {
display: none;
}
}

@media (width < 64rem) {
.settings-item.mobile-dropdown-item {
display: block;
}
.settings-item:not(.mobile-dropdown-item) {
display: none;
}
}

@media (width < 50rem) {
.notes-item.mobile-dropdown-item {
display: block;
}
.notes-item:not(.mobile-dropdown-item) {
display: none;
}
}
</style>
1 change: 1 addition & 0 deletions confiture-web-app/src/components/audit/NotesModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ function handleDeleteFile(file: AuditFile) {
}
.title-container {
flex-basis: 100%;
flex-grow: 1;
}

textarea {
Expand Down
47 changes: 26 additions & 21 deletions confiture-web-app/src/components/audit/SaveIndicator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,30 +110,35 @@ setInterval(() => {
</script>

<template>
<Dropdown
:title="dropdownTitle"
align-left
icon-left
:button-props="{
class: `fr-btn--tertiary-no-outline ${dropdownIcon}`,
'aria-live': !systemStore.isOnline ? 'assertive' : 'polite',
role: 'alert',
style: !systemStore.isOnline
? 'color: var(--text-default-error);'
: undefined
}"
>
<p class="fr-text--sm fr-mb-1v">
{{ dropdownMainText }}
</p>

<p v-if="relativeLastSaveDate" class="fr-text--xs fr-m-0">
Dernier enregistrement {{ relativeLastSaveDate }}
</p>
</Dropdown>
<div class="dropdown-container">
<Dropdown
:title="dropdownTitle"
align-left
icon-left
:button-props="{
class: `fr-btn--tertiary-no-outline ${dropdownIcon}`,
'aria-live': !systemStore.isOnline ? 'assertive' : 'polite',
role: 'alert',
style: !systemStore.isOnline
? 'color: var(--text-default-error);'
: undefined
}"
>
<p class="fr-text--sm fr-mb-1v">
{{ dropdownMainText }}
</p>

<p v-if="relativeLastSaveDate" class="fr-text--xs fr-m-0">
Dernier enregistrement {{ relativeLastSaveDate }}
</p>
</Dropdown>
</div>
</template>

<style scoped>
.dropdown-container {
min-width: 10rem;
}
:deep(.fr-btn--tertiary-no-outline) {
padding: 0;
}
Expand Down
Loading