Skip to content

A self-hosted media server and file management system

fix: improve style consistency between legacy and global modal

aminnausin9ca419e9b3df
diff --git a/resources/js/components/cedar-ui/date-picker/DatePicker.vue b/resources/js/components/cedar-ui/date-picker/DatePicker.vue
index b4cf19e2..a4c33f28 100644
--- a/resources/js/components/cedar-ui/date-picker/DatePicker.vue
+++ b/resources/js/components/cedar-ui/date-picker/DatePicker.vue
@@ -95,7 +95,7 @@ watch(datePickerPanel, () => {
@click="
toggleDatePicker();
if (datePickerOpen && datePickerInput) {
- datePickerInput?.focus();
+ datePickerInput.focus({ preventScroll: true });
}
"
variant="ghost"
diff --git a/resources/js/components/cedar-ui/modal/GlobalModal.vue b/resources/js/components/cedar-ui/modal/GlobalModal.vue
index d9ba934b..af8f7919 100644
--- a/resources/js/components/cedar-ui/modal/GlobalModal.vue
+++ b/resources/js/components/cedar-ui/modal/GlobalModal.vue
@@ -8,9 +8,9 @@ const modalStore = useModalStore();
</script>
<template>
<Teleport to="body">
- <dialog
+ <div
v-show="modalStore.isOpen || modalStore.isAnimating"
- class="modal text-foreground-0 fixed top-0 left-0 z-300 flex h-screen w-screen items-center justify-center bg-transparent"
+ class="modal fixed top-0 left-0 z-300 flex h-screen w-screen items-center justify-center bg-transparent"
v-cloak
aria-modal="true"
aria-labelledby="modalTitle"
@@ -50,6 +50,6 @@ const modalStore = useModalStore();
</OnClickOutside>
</UseFocusTrap>
</Transition>
- </dialog>
+ </div>
</Teleport>
</template>
diff --git a/resources/js/components/cedar-ui/modal/ModalBase.vue b/resources/js/components/cedar-ui/modal/ModalBase.vue
index 308a6e0b..22333b00 100644
--- a/resources/js/components/cedar-ui/modal/ModalBase.vue
+++ b/resources/js/components/cedar-ui/modal/ModalBase.vue
@@ -1,4 +1,6 @@
<script setup lang="ts">
+// Legacy
+
import { ref, useTemplateRef, watch } from 'vue';
import { ButtonCorner, ButtonForm } from '@/components/cedar-ui/button';
import { OnClickOutside } from '@vueuse/components';
@@ -48,7 +50,7 @@ watch(
<Teleport to="body">
<dialog
v-show="modalData.modalOpen || modalData.isAnimating"
- class="modal fixed top-0 left-0 z-300 flex h-screen w-screen items-center justify-center bg-transparent text-gray-900 dark:text-neutral-200"
+ class="modal fixed top-0 left-0 z-300 flex h-screen w-screen items-center justify-center bg-transparent"
v-cloak
aria-modal="true"
aria-labelledby="modalTitle"
@@ -76,7 +78,7 @@ watch(
<OnClickOutside
@trigger="closeModal"
@keydown.esc="closeModal"
- class="3xl:max-w-xl m-auto flex w-full flex-col gap-4 rounded-2xl border border-neutral-200 bg-white p-6 shadow-lg drop-shadow-md backdrop-blur-lg sm:max-w-lg xl:max-w-xl dark:border-neutral-700 dark:bg-neutral-800/90"
+ class="3xl:max-w-xl bg-overlay-2-t border-overlay-border m-auto flex w-full flex-col gap-4 rounded-2xl border p-6 shadow-lg drop-shadow-md backdrop-blur-lg sm:max-w-lg xl:max-w-xl"
tabindex="-1"
>
<section class="flex flex-wrap items-center gap-2">