Merge branch 'master' of ssh://git.crapts.org:10022/marco/contexted-v3

This commit is contained in:
2023-06-08 00:46:35 +02:00

View File

@@ -92,10 +92,10 @@ const topBarHeightWithSafeArea = computed(() => `calc(${topBarHeight}px + var(--
/>
</Transition>
<main
class="transition[margin-left] z-10 mx-auto flex h-full w-full max-w-app flex-col overflow-y-auto border-x-[1px] bg-white pb-[var(--safe-area-bottom)] duration-200 ease-out"
class="transition[margin-left] z-10 mx-auto flex h-full w-full max-w-app flex-col overflow-y-auto bg-white pb-[var(--safe-area-bottom)] duration-200 ease-out sm:border-x-[1px]"
:class="sideBarCollapsed ? 'ml-0' : 'sm:ml-sidebar'"
>
<div class="flex flex-grow px-10 py-6 max-sm:px-4 max-sm:py-3">
<div class="flex w-full flex-grow px-10 py-6 max-sm:px-4 max-sm:py-3">
<template v-if="!loading">
<Note
v-if="activeViewMode.name === 'Note' && activeNote"