Skip to content

πŸ“š The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.

Improvments & fixes

Smaug6739f1402850ef75
diff --git a/frontend/app/components/AppSelect.vue b/frontend/app/components/AppSelect.vue
index 8afe2b99..b223756f 100644
--- a/frontend/app/components/AppSelect.vue
+++ b/frontend/app/components/AppSelect.vue
@@ -123,6 +123,7 @@ button,
.search-input {
cursor: text;
+ border: none;
}
.category-select:has(.dropdown) button,
diff --git a/frontend/app/components/MarkdownEditor/LazyMarkdownEditor.vue b/frontend/app/components/MarkdownEditor/LazyMarkdownEditor.vue
index 10231650..4fbe5017 100644
--- a/frontend/app/components/MarkdownEditor/LazyMarkdownEditor.vue
+++ b/frontend/app/components/MarkdownEditor/LazyMarkdownEditor.vue
@@ -6,7 +6,7 @@
<input placeholder="Title" class="title" v-model="document.name" v-if="!minimal" />
<input placeholder="Description" class="description" v-model="document.description" v-if="!minimal" />
<div class="markdown" ref="container">
- <div ref="editorContainer" class="codemirror-editor" @scroll="syncScroll" />
+ <div ref="editorContainer" class="codemirror-editor" @scroll="syncScroll" style="border-right: 1px solid var(--border-color)" />
<div v-if="showPreview" class="markdown-preview document-theme" ref="markdownPreview" v-html="document.content_html"></div>
</div>
</div>
diff --git a/frontend/app/components/MarkdownEditor/Toolbar.vue b/frontend/app/components/MarkdownEditor/Toolbar.vue
index 61dac370..6b50d08c 100644
--- a/frontend/app/components/MarkdownEditor/Toolbar.vue
+++ b/frontend/app/components/MarkdownEditor/Toolbar.vue
@@ -3,7 +3,7 @@
<button v-for="item in toolbar" :key="item.name" v-html="item.icon" @click="emitAction(item.action)" :title="item.name"></button>
<AppSelect v-model="document.accessibility" :items="accessibilities" placeholder="Access" size="100px" class="entry" v-if="!minimal" />
<AppSelect v-model="document.category" :items="categories" placeholder="Select category" size="220px" class="entry" v-if="!minimal" />
- <input type="text" v-model="document.tags" placeholder="Tags" class="entry" style="margin-right: 5px" />
+ <input type="text" v-model="document.tags" placeholder="Tags" class="entry" />
<AppHint text="Tags separated with a comma" />
</div>
</template>
@@ -102,9 +102,9 @@ const toolbar = [
align-items: center;
flex-wrap: wrap;
background-color: var(--bg-contrast-2);
- border-radius: 25px;
+ border-radius: 6px;
border: 1px solid var(--border-color);
- padding: 0.25rem;
+ padding: 0.15rem;
color: var(--font-color-dark);
gap: 0 2.5px;
}
@@ -135,7 +135,6 @@ input,
.select {
display: inline-block;
max-width: 350px;
- font-size: 0.9rem !important;
}
.entry {
background-color: var(--bg-color);
diff --git a/frontend/app/components/MediumView.vue b/frontend/app/components/MediumView.vue
index c7c792b8..7ef88b9d 100644
--- a/frontend/app/components/MediumView.vue
+++ b/frontend/app/components/MediumView.vue
@@ -7,7 +7,7 @@
<script setup lang="ts">
const { isOpened, paneWidth, isResizing } = useSidebar();
const mediumContainer = ref<HTMLElement | null>(null);
-const marginLeft = computed(() => (isMobile() || !isOpened.value ? '12px' : `${paneWidth.value + 12}px`));
+const marginLeft = computed(() => (isMobile() || !isOpened.value ? '10px' : `${paneWidth.value + 10}px`));
const transition = computed(() => (isResizing.value ? 'none' : 'padding-left 0.3s'));
</script>
diff --git a/frontend/app/components/Sidebar/SidebarItem.vue b/frontend/app/components/Sidebar/SidebarItem.vue
index 1f481f21..e44177f6 100644
--- a/frontend/app/components/Sidebar/SidebarItem.vue
+++ b/frontend/app/components/Sidebar/SidebarItem.vue
@@ -102,6 +102,7 @@ const drop = async (event: DragEvent) => {
width: 98%;
font-size: 15.2px;
font-weight: 500;
+ cursor: pointer;
&:hover,
&:has(.router-link-exact-active:not(.nav)) {
background: var(--bg-contrast-2);
diff --git a/frontend/app/components/Sidebar/SidebarWorkspaces.vue b/frontend/app/components/Sidebar/SidebarWorkspaces.vue
index 729c26a8..bfaaf0f2 100644
--- a/frontend/app/components/Sidebar/SidebarWorkspaces.vue
+++ b/frontend/app/components/Sidebar/SidebarWorkspaces.vue
@@ -16,6 +16,7 @@
<div v-else class="placeholder" style="padding: 6px; font-size: 0.9rem; font-style: italic">No workspaces found</div>
<hr />
<div @click="create_workspace" class="new-workspace"><Icon name="plus" fill="var(--font-color-light)" /> New Workspace</div>
+ <NuxtLink :to="`/dashboard/categories/${selectedOption.value}/edit`" class="new-workspace"><Icon name="settings" fill="var(--font-color-light)" /> Edit Workspace</NuxtLink>
</ul>
</div>
</template>
diff --git a/frontend/app/helpers/icons.ts b/frontend/app/helpers/icons.ts
index ce006ef4..9fbf5877 100644
--- a/frontend/app/helpers/icons.ts
+++ b/frontend/app/helpers/icons.ts
@@ -41,7 +41,7 @@ const icons = {
users: `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M40-160v-112q0-34 17.5-62.5T104-378q62-31 126-46.5T360-440q66 0 130 15.5T616-378q29 15 46.5 43.5T680-272v112H40Zm720 0v-120q0-44-24.5-84.5T666-434q51 6 96 20.5t84 35.5q36 20 55 44.5t19 53.5v120H760ZM360-480q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 66-47 113t-113 47Zm400-160q0 66-47 113t-113 47q-11 0-28-2.5t-28-5.5q27-32 41.5-71t14.5-81q0-42-14.5-81T544-792q14-5 28-6.5t28-1.5q66 0 113 47t47 113ZM120-240h480v-32q0-11-5.5-20T580-306q-54-27-109-40.5T360-360q-56 0-111 13.5T140-306q-9 5-14.5 14t-5.5 20v32Zm240-320q33 0 56.5-23.5T440-640q0-33-23.5-56.5T360-720q-33 0-56.5 23.5T280-640q0 33 23.5 56.5T360-560Zm0 320Zm0-400Z"/></svg>`,
user_settings: `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M400-480q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 66-47 113t-113 47ZM80-160v-112q0-33 17-62t47-44q51-26 115-44t141-18h14q6 0 12 2-8 18-13.5 37.5T404-360h-4q-71 0-127.5 18T180-306q-9 5-14.5 14t-5.5 20v32h252q6 21 16 41.5t22 38.5H80Zm560 40-12-60q-12-5-22.5-10.5T584-204l-58 18-40-68 46-40q-2-14-2-26t2-26l-46-40 40-68 58 18q11-8 21.5-13.5T628-460l12-60h80l12 60q12 5 22.5 11t21.5 15l58-20 40 70-46 40q2 12 2 25t-2 25l46 40-40 68-58-18q-11 8-21.5 13.5T732-180l-12 60h-80Zm40-120q33 0 56.5-23.5T760-320q0-33-23.5-56.5T680-400q-33 0-56.5 23.5T600-320q0 33 23.5 56.5T680-240ZM400-560q33 0 56.5-23.5T480-640q0-33-23.5-56.5T400-720q-33 0-56.5 23.5T320-640q0 33 23.5 56.5T400-560Zm0-80Zm12 400Z"/></svg>`,
view: `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960" fill="var(--font-color)"><path d="M480-320q75 0 127.5-52.5T660-500q0-75-52.5-127.5T480-680q-75 0-127.5 52.5T300-500q0 75 52.5 127.5T480-320Zm0-72q-45 0-76.5-31.5T372-500q0-45 31.5-76.5T480-608q45 0 76.5 31.5T588-500q0 45-31.5 76.5T480-392Zm0 192q-146 0-266-81.5T40-500q54-137 174-218.5T480-800q146 0 266 81.5T920-500q-54 137-174 218.5T480-200Zm0-300Zm0 220q113 0 207.5-59.5T832-500q-50-101-144.5-160.5T480-720q-113 0-207.5 59.5T128-500q50 101 144.5 160.5T480-280Z"/></svg>`,
- workspace: `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200Zm0-640v560h560v-560h-80v245q0 12-10 17.5t-20-.5l-49-30q-10-6-21-6t-21 6l-49 30q-10 6-20 .5T480-515v-245H200Zm0 560v-560 560Z"/></svg>`,
+ workspace: `<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#1f1f1f"><path d="M440-183v-274L200-596v274l240 139Zm80 0 240-139v-274L520-457v274Zm-40-343 237-137-237-137-237 137 237 137ZM160-252q-19-11-29.5-29T120-321v-318q0-22 10.5-40t29.5-29l280-161q19-11 40-11t40 11l280 161q19 11 29.5 29t10.5 40v318q0 22-10.5 40T800-252L520-91q-19 11-40 11t-40-11L160-252Zm320-228Z"/></svg>`,
};
export type IconName = keyof typeof icons;
diff --git a/frontend/app/pages/dashboard/categories/_modals/CreateCategoryModal.vue b/frontend/app/pages/dashboard/categories/_modals/CreateCategoryModal.vue
index e6f79709..d87a6fbd 100644
--- a/frontend/app/pages/dashboard/categories/_modals/CreateCategoryModal.vue
+++ b/frontend/app/pages/dashboard/categories/_modals/CreateCategoryModal.vue
@@ -36,6 +36,7 @@ const category = ref<Partial<Category>>({
name: '',
type: 'category',
role: props.role,
+ order: 0,
id: '0',
});
const emit = defineEmits(['close']);
diff --git a/frontend/app/pages/dashboard/docs/[id].vue b/frontend/app/pages/dashboard/docs/[id].vue
index 03e7211c..8165f14a 100644
--- a/frontend/app/pages/dashboard/docs/[id].vue
+++ b/frontend/app/pages/dashboard/docs/[id].vue
@@ -1,5 +1,5 @@
<template>
- <div v-if="article?.id" style="width: 100%; padding: 0 0.5rem">
+ <div v-if="article?.id" style="width: 100%; padding: 1rem">
<div style="display: flex; justify-content: space-between">
<div :style="{ width: '100%', margin: 'auto', maxWidth: usePreferences().get('docSize') == 0 ? '980px' : '780px' }">
<DocumentCardHeader :doc="article" style="margin-bottom: 20px" />
@@ -7,7 +7,7 @@
<DocumentCardFooter :document="article" :next="next" :previous="previous" />
</div>
<div v-if="!isTablet() && !preferencesStore.get('hideTOC')" class="toc"><TableOfContent :doc="article" :element="element" class="toc" style="width: 400px" /></div>
- <div :style="{ marginRight: !isTablet() && preferencesStore.get('hideTOC') && useSidebar().isOpened.value ? '370px' : '0px', transition: 'margin 0.3s' }"></div>
+ <div :style="{ marginRight: !isTablet() && preferencesStore.get('hideTOC') && useSidebar().isOpened.value ? '200px' : '0px', transition: 'margin 0.3s' }"></div>
</div>
</div>
<Error v-else-if="error" :error="error" />