diff --git a/app/assets/_content.css b/app/assets/_content.css index a9f98a5..ac71d6b 100644 --- a/app/assets/_content.css +++ b/app/assets/_content.css @@ -40,23 +40,19 @@ } } + p, ul, ol { + font-size: var(--text-sm); + } + /* Normal link */ p a:not([class]) { - color: var(--color-sky-600); + color: var(--color-primary); text-underline-offset: .25rem; &:hover { - color: var(--color-sky-500); + color: var(--color-accent); text-decoration: underline; } - - @variant dark { - color: var(--color-teal-500); - - &:hover { - color: var(--color-teal-300); - } - } } ul { diff --git a/app/assets/theme.css b/app/assets/theme.css index 312f9c3..718ee70 100644 --- a/app/assets/theme.css +++ b/app/assets/theme.css @@ -56,7 +56,7 @@ --primary: rgb(101, 230, 166); --primary-foreground: hsl(180 0 4.9%); - --secondary: hsl(222.2 47.4% 11.2%); + --secondary: hsl(0, 0%, 22.5%); --secondary-foreground: hsl(210 40% 98%); --accent: hsl(11, 87%, 69%); diff --git a/app/components/calendar/dialog/QuickCreateEvent.vue b/app/components/calendar/dialog/QuickCreateEvent.vue index 45efcb3..5f0fc9a 100644 --- a/app/components/calendar/dialog/QuickCreateEvent.vue +++ b/app/components/calendar/dialog/QuickCreateEvent.vue @@ -6,6 +6,13 @@ import { VisuallyHidden } from "radix-vue"; const isDialogOpen = ref(false); const { resetSkeleton } = useCalendar(); +// Watch the popover state +watch(isDialogOpen, (hasOpened, _o) => { + if (hasOpened) { + resetSkeleton() + } +}) + // Toggles the dialog function toggleDialog() { isDialogOpen.value = !isDialogOpen.value; @@ -45,7 +52,7 @@ const breakpoints = useBreakpoints( class="max-md:translate-0 max-md:inset-0 max-md:w-full max-md:block" :trap-focus="true" @escape-key-down="handleClosing" - @pointer-down-outside.prevent="handleClosing" + @pointer-down-outside="handleClosing" > {{ $t("entity.calendar.event.addSingle") }} diff --git a/app/components/calendar/dialog/UpdateEvent.vue b/app/components/calendar/dialog/UpdateEvent.vue index 81be899..0008aff 100644 --- a/app/components/calendar/dialog/UpdateEvent.vue +++ b/app/components/calendar/dialog/UpdateEvent.vue @@ -29,7 +29,7 @@ function handleClosing() { @escape-key-down="handleClosing" @focus-outside="handleClosing" @interact-outside="handleClosing" - @pointer-down-outside="(e) => e.preventDefault()" + @pointer-down-outside.prevent >
diff --git a/app/components/calendar/form/Create.vue b/app/components/calendar/form/Create.vue index fe83a2f..2ea85da 100644 --- a/app/components/calendar/form/Create.vue +++ b/app/components/calendar/form/Create.vue @@ -16,6 +16,9 @@ onMounted(() => { type FormTabs = "global" | "months" | "today" const activeTab = ref("global") +const newCalendarName = shallowRef() +useFocus(newCalendarName, { initialValue: true }) + /** * === Current date === */ @@ -103,6 +106,7 @@ function handleFormCancel() { { type FormTabs = "global" | "months" | "today" const activeTab = ref("global") +const newCalendarName = shallowRef() +useFocus(newCalendarName, { initialValue: true }) + /** * === Form Validation === */ @@ -85,6 +88,7 @@ function handleFormCancel() { keys.control_period?.value) -whenever(keys.control_period, () => { - openUiDialog() -}) +whenever(controlPeriod, openUiDialog) const searchResultsRef = ref(null) const { y: searchResultsY } = useScroll(searchResultsRef) diff --git a/app/components/calendar/state/monthly/DayTile.vue b/app/components/calendar/state/monthly/DayTile.vue index 122ebbb..fee3847 100644 --- a/app/components/calendar/state/monthly/DayTile.vue +++ b/app/components/calendar/state/monthly/DayTile.vue @@ -188,7 +188,12 @@ async function handleTileDrop() { + + + + diff --git a/app/components/global/sidebar/Footer.vue b/app/components/global/sidebar/Footer.vue new file mode 100644 index 0000000..79ab1e4 --- /dev/null +++ b/app/components/global/sidebar/Footer.vue @@ -0,0 +1,18 @@ + + + + diff --git a/app/components/global/sidebar/Menu.vue b/app/components/global/sidebar/Menu.vue new file mode 100644 index 0000000..655ca13 --- /dev/null +++ b/app/components/global/sidebar/Menu.vue @@ -0,0 +1,50 @@ + + + + + diff --git a/app/components/global/sidebar/Sidebar.vue b/app/components/global/sidebar/Sidebar.vue index e73bd6e..f5286ed 100644 --- a/app/components/global/sidebar/Sidebar.vue +++ b/app/components/global/sidebar/Sidebar.vue @@ -1,136 +1,32 @@ diff --git a/app/components/global/sidebar/SidebarToggle.vue b/app/components/global/sidebar/Toggle.vue similarity index 65% rename from app/components/global/sidebar/SidebarToggle.vue rename to app/components/global/sidebar/Toggle.vue index 4f03b42..c5973ae 100644 --- a/app/components/global/sidebar/SidebarToggle.vue +++ b/app/components/global/sidebar/Toggle.vue @@ -8,8 +8,9 @@ const { toggleSidebar } = useUiStore() - + diff --git a/app/components/global/user/CTA.vue b/app/components/global/user/CTA.vue index 667ff4e..88aeee9 100644 --- a/app/components/global/user/CTA.vue +++ b/app/components/global/user/CTA.vue @@ -1,7 +1,7 @@