Skip to content

style: improve mobile responsiveness and visual consistency in modal dialogs #2010

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

Open
MrDirkelz wants to merge 1 commit into
base: main
Choose a base branch
from
+42 −35
Open

style: improve mobile responsiveness and visual consistency in modal dialogs #2010

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
57 changes: 29 additions & 28 deletions app/src/components/common/LDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,47 +21,48 @@ withDefaults(defineProps<Props>(), {
</script>

<template>
<LModal v-model:isVisible="open" :heading="title" @close="open = false">
<LModal
v-model:isVisible="open"
:heading="title"
@close="open = false"
>
<template #default>
<div class="sm:flex sm:items-start">
<div class="flex items-start gap-3 sm:gap-4">
<div
class="mx-auto flex h-12 w-12 flex-shrink-0 items-center justify-center rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10"
class="flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-full bg-red-100"
v-if="context === 'danger'"
>
<ExclamationTriangleIcon class="h-6 w-6 text-red-600" aria-hidden="true" />
<ExclamationTriangleIcon
class="h-6 w-6 text-red-600"
aria-hidden="true"
/>
</div>
<div
:class="[
'mt-3 text-center sm:mt-0 sm:text-left',
{ 'sm:ml-4': context !== 'default' },
]"
>
<div class="mt-2" v-if="description">
<p class="text-sm">
{{ description }}
</p>
</div>
<div class="min-w-0 flex-1 text-left">
<p
class="text-sm"
v-if="description"
>
{{ description }}
</p>
<slot />
</div>
</div>
</template>

<template #footer>
<div class="mt-5 sm:mt-4 sm:flex sm:flex-row-reverse">
<span class="mb-3 block sm:mb-0 sm:ml-3">
<LButton
@click="primaryAction()"
variant="primary"
class="inline-flex w-full sm:w-auto"
:context="context"
data-test="modal-primary-button"
>
{{ primaryButtonText }}
</LButton>
</span>
<div class="mt-5 flex flex-col gap-2 sm:mt-4 sm:flex-row-reverse sm:gap-3">
<LButton
@click="primaryAction()"
variant="primary"
class="w-full sm:w-auto"
:context="context"
data-test="modal-primary-button"
>
{{ primaryButtonText }}
</LButton>
<LButton
@click="secondaryAction()"
class="inline-flex w-full sm:w-auto"
class="w-full sm:w-auto"
v-if="secondaryAction && secondaryButtonText"
data-test="modal-secondary-button"
>
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/form/LModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const emit = defineEmits(["close"]);
@close="emit('close')"
>
<div
class="max-h-screen w-full max-w-md overflow-y-auto rounded-lg"
class="max-h-full w-full max-w-md overflow-y-auto rounded-lg"
:class="[
props.withBackground !== false
? 'bg-white/90 p-5 shadow-xl dark:bg-slate-700/85'
Expand Down
9 changes: 6 additions & 3 deletions app/src/components/navigation/DesktopSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,17 +452,20 @@ const handleLogin = () => {
:secondaryAction="() => (showLogoutDialog = false)"
:secondaryButtonText="t('logout.modal.button_cancel')"
>
<label class="mt-4 flex cursor-pointer items-start gap-3">
<label
class="mt-4 flex cursor-pointer items-start gap-3 rounded-lg bg-zinc-100/80 p-3 dark:bg-slate-800/40"
>
<LToggle
class="mt-0.5"
:modelValue="forceReauthOnNextLogin"
@update:modelValue="(value: boolean) => (forceReauthOnNextLogin = value)"
data-test="shared-device-toggle"
/>
<span class="text-sm">
<span class="text-sm leading-snug">
<span class="block font-medium text-zinc-900 dark:text-white">
{{ t("logout.modal.force_global_logout_label") }}
</span>
<span class="mt-0.5 block text-zinc-500 dark:text-slate-300">
<span class="mt-1 block text-xs text-zinc-500 dark:text-slate-300">
{{ t("logout.modal.force_global_logout_description") }}
</span>
</span>
Expand Down
9 changes: 6 additions & 3 deletions app/src/components/navigation/ProfileMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,17 +578,20 @@ const sidebarNavigation = computed(() =>
:secondaryAction="() => (showLogoutDialog = false)"
:secondaryButtonText="t('logout.modal.button_cancel')"
>
<label class="mt-4 flex cursor-pointer items-start gap-3">
<label
class="mt-4 flex cursor-pointer items-start gap-3 rounded-lg bg-zinc-100/80 p-3 dark:bg-slate-800/40"
>
<LToggle
class="mt-0.5"
:modelValue="forceReauthOnNextLogin"
@update:modelValue="(value: boolean) => (forceReauthOnNextLogin = value)"
data-test="shared-device-toggle"
/>
<span class="text-sm">
<span class="text-sm leading-snug">
<span class="block font-medium text-zinc-900 dark:text-white">
{{ t("logout.modal.force_global_logout_label") }}
</span>
<span class="mt-0.5 block text-zinc-500 dark:text-slate-300">
<span class="mt-1 block text-xs text-zinc-500 dark:text-slate-300">
{{ t("logout.modal.force_global_logout_description") }}
</span>
</span>
Expand Down
Loading