fix layout
This commit is contained in:
72
src/App.vue
72
src/App.vue
@@ -7,7 +7,7 @@ import {
|
|||||||
setClientKey,
|
setClientKey,
|
||||||
passphraseRequired
|
passphraseRequired
|
||||||
} from '@/composables/useEncryption'
|
} from '@/composables/useEncryption'
|
||||||
import { initializeSettings} from '@/composables/useSettings'
|
import { initializeSettings } from '@/composables/useSettings'
|
||||||
import { windowIsMobile } from '@/utils/helpers'
|
import { windowIsMobile } from '@/utils/helpers'
|
||||||
import SideBar from '@/components/SideBar.vue'
|
import SideBar from '@/components/SideBar.vue'
|
||||||
import firebase from 'firebase/compat/app'
|
import firebase from 'firebase/compat/app'
|
||||||
@@ -56,24 +56,25 @@ provide('loading', loading)
|
|||||||
:side-bar-collapsed="sideBarCollapsed"
|
:side-bar-collapsed="sideBarCollapsed"
|
||||||
@toggle-side-bar="sideBarCollapsed = !sideBarCollapsed"
|
@toggle-side-bar="sideBarCollapsed = !sideBarCollapsed"
|
||||||
/>
|
/>
|
||||||
|
<!-- <div class="absolute bottom-0 left-0 right-0 top-[50px] mx-auto flex flex-grow"> -->
|
||||||
<div class="mx-auto flex w-full max-w-app flex-grow">
|
<div class="mx-auto flex w-full max-w-app flex-grow">
|
||||||
<Transition name="sidebar">
|
<Transition name="sidebar">
|
||||||
<SideBar
|
<SideBar
|
||||||
:view-modes="viewModes"
|
:view-modes="viewModes"
|
||||||
:active-view-mode="activeViewMode"
|
:active-view-mode="activeViewMode"
|
||||||
@set-view-mode="(viewMode) => (activeViewMode = viewMode)"
|
@set-view-mode="(viewMode) => (activeViewMode = viewMode)"
|
||||||
@collapse="(collapse) => (sideBarCollapsed = collapse)"
|
@collapse="(collapse) => (sideBarCollapsed = collapse)"
|
||||||
class="mt-[50px] bg-gray-100 px-3 py-6 transition-[width] delay-200 duration-0 max-sm:z-50 max-sm:border-x-[1px] max-sm:py-3 max-sm:transition-transform max-sm:delay-0 max-sm:duration-200"
|
class="mt-[50px] bg-gray-100 px-3 py-6 transition-[width] delay-200 duration-0 max-sm:z-50 max-sm:border-x-[1px] max-sm:py-3 max-sm:transition-transform max-sm:delay-0 max-sm:duration-200"
|
||||||
v-if="!sideBarCollapsed"
|
v-if="!sideBarCollapsed"
|
||||||
/>
|
/>
|
||||||
</Transition>
|
</Transition>
|
||||||
<main
|
<main
|
||||||
class="transition[margin-left] z-10 mt-[50px] w-full border-x-[1px] bg-white px-10 py-6 duration-200 ease-out max-sm:px-4 max-sm:py-3"
|
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 px-10 py-6 duration-200 ease-out max-sm:px-4 max-sm:py-3"
|
||||||
:class="sideBarCollapsed ? 'ml-0' : 'sm:ml-sidebar'"
|
:class="sideBarCollapsed ? 'ml-0' : 'sm:ml-sidebar'"
|
||||||
>
|
>
|
||||||
<Transition name="overlay">
|
<Transition name="overlay">
|
||||||
<div
|
<div
|
||||||
class="absolute bottom-0 left-0 right-0 top-0 bg-neutral-800 bg-opacity-60 transition-opacity duration-200 sm:hidden cursor-pointer z-40"
|
class="absolute bottom-0 left-0 right-0 top-0 z-40 cursor-pointer bg-neutral-800 bg-opacity-60 transition-opacity duration-200 sm:hidden"
|
||||||
@click="sideBarCollapsed = true"
|
@click="sideBarCollapsed = true"
|
||||||
v-if="!sideBarCollapsed"
|
v-if="!sideBarCollapsed"
|
||||||
/>
|
/>
|
||||||
@@ -90,13 +91,57 @@ provide('loading', loading)
|
|||||||
<Mindmap v-else-if="activeViewMode.name === 'Mindmap'" />
|
<Mindmap v-else-if="activeViewMode.name === 'Mindmap'" />
|
||||||
</template>
|
</template>
|
||||||
<SkeletonNote v-else />
|
<SkeletonNote v-else />
|
||||||
|
<!-- <div>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
<p>bla</p>
|
||||||
|
</div> -->
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
<Modal :open="passphraseRequired" :persistent="true">
|
<Modal :open="passphraseRequired" :persistent="true">
|
||||||
<template #title>Enter your passphrase</template>
|
<template #title>Enter your passphrase</template>
|
||||||
<template #default>
|
<template #default>
|
||||||
<p>
|
<p>
|
||||||
Your notes are encrypted. Please enter your encryption key passphrase to decrypt your cloud notes.
|
Your notes are encrypted. Please enter your encryption key passphrase to decrypt your cloud
|
||||||
|
notes.
|
||||||
</p>
|
</p>
|
||||||
<input type="password" class="input-bordered input mt-4 w-full" v-model="passphrase" />
|
<input type="password" class="input-bordered input mt-4 w-full" v-model="passphrase" />
|
||||||
</template>
|
</template>
|
||||||
@@ -114,4 +159,7 @@ provide('loading', loading)
|
|||||||
.overlay-leave-to {
|
.overlay-leave-to {
|
||||||
@apply opacity-0;
|
@apply opacity-0;
|
||||||
}
|
}
|
||||||
|
main {
|
||||||
|
contain: size layout style;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -159,7 +159,7 @@ const createLink = (link: string) => {
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<div class="relative" ref="editorElement">
|
<div class="relative overflow-x-hidden" ref="editorElement">
|
||||||
<CKEditor
|
<CKEditor
|
||||||
class="w-full flex-grow text-[110%] font-light"
|
class="w-full flex-grow text-[110%] font-light"
|
||||||
:editor="editor"
|
:editor="editor"
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ const authModalInitialStateOpen = ref<boolean>(authUI.isPendingRedirect())
|
|||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<div
|
<div
|
||||||
class="fixed left-0 right-0 top-0 z-[500] flex h-[50px] bg-primary"
|
class="z-[500] flex h-[50px] bg-primary"
|
||||||
:class="searchActive && 'search-active'"
|
:class="searchActive && 'search-active'"
|
||||||
>
|
>
|
||||||
<div class="mx-auto flex w-full max-w-app items-center py-2.5 text-white">
|
<div class="mx-auto flex w-full max-w-app items-center py-2.5 text-white">
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ const setRoot = async (closeModal: () => Promise<Boolean>) => {
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<div class="flex h-full flex-col">
|
<div class="flex flex-grow flex-col">
|
||||||
<NoteToolbar :note="props.note" @delete="del" @set-root="setRoot">
|
<NoteToolbar :note="props.note" @delete="del" @set-root="setRoot">
|
||||||
<template #title>
|
<template #title>
|
||||||
<i
|
<i
|
||||||
|
|||||||
@@ -5,17 +5,28 @@
|
|||||||
@import '@fontsource/source-sans-pro/300';
|
@import '@fontsource/source-sans-pro/300';
|
||||||
|
|
||||||
html {
|
html {
|
||||||
height: -webkit-fill-available;
|
// height: -webkit-fill-available;
|
||||||
|
height: 100%;
|
||||||
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
min-height: 100vh;
|
// min-height: 100vh;
|
||||||
min-height: -webkit-fill-available;
|
// min-height: -webkit-fill-available;
|
||||||
|
height: 100%;
|
||||||
|
min-height: 100%;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 100%;
|
||||||
|
position: fixed;
|
||||||
|
transform: translateZ(0);
|
||||||
|
touch-action: manipulation;
|
||||||
|
-webkit-user-drag: none;
|
||||||
|
-ms-content-zooming: none;
|
||||||
font-family: 'Source Sans Pro', sans-serif;
|
font-family: 'Source Sans Pro', sans-serif;
|
||||||
overflow-y: scroll;
|
// overflow-y: scroll;
|
||||||
@apply flex flex-col bg-gray-100;
|
@apply flex flex-col bg-gray-100;
|
||||||
#app {
|
#app {
|
||||||
@apply flex flex-grow flex-col;
|
@apply absolute bottom-0 left-0 right-0 top-0 flex flex-grow flex-col overflow-hidden;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -45,7 +56,7 @@ p:last-child {
|
|||||||
@apply cursor-pointer font-semibold text-primary hover:bg-gray-200;
|
@apply cursor-pointer font-semibold text-primary hover:bg-gray-200;
|
||||||
}
|
}
|
||||||
&.ck.ck-editor__editable_inline > * {
|
&.ck.ck-editor__editable_inline > * {
|
||||||
margin: 0!important;
|
margin: 0 !important;
|
||||||
}
|
}
|
||||||
ol,
|
ol,
|
||||||
ul {
|
ul {
|
||||||
|
|||||||
Reference in New Issue
Block a user