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.

Improve css and code style, organization, class names

Smaug6739b8735f384872
diff --git a/frontend/app/components/AppButton.vue b/frontend/app/components/AppButton.vue
index 0e0e63d2..b1063e7a 100644
--- a/frontend/app/components/AppButton.vue
+++ b/frontend/app/components/AppButton.vue
@@ -54,6 +54,7 @@ button {
.link {
color: var(--primary);
background: none;
+ font-weight: bold;
cursor: pointer;
&:hover {
diff --git a/frontend/app/components/AppSelect.vue b/frontend/app/components/AppSelect.vue
index 2f33b39a..72d519d1 100644
--- a/frontend/app/components/AppSelect.vue
+++ b/frontend/app/components/AppSelect.vue
@@ -11,8 +11,8 @@
@keydown="handleKeyDown"
@click.stop
/>
- <div v-else class="app-select-trigger" @click.stop="toggleDropdown">
- <button style="height: 30px">{{ selected?.label || placeholder }}</button>
+ <div v-else class="trigger" @click.stop="toggleDropdown">
+ <button class="trigger-button">{{ selected?.label || placeholder }}</button>
<svg :class="{ rotated: !open }" xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24" fill="var(--font-color)">
<path d="M480-345 240-585l56-56 184 184 184-184 56 56-240 240Z" />
</svg>
@@ -168,7 +168,7 @@ function toggleDropdown() {
if (open.value) {
search.value = '';
nextTick(() => {
- if (isMobile) {
+ if (isMobile.value) {
// Lock body scroll on mobile
document.body.style.overflow = 'hidden';
mobileSearchInput.value?.focus();
@@ -243,12 +243,15 @@ onBeforeUnmount(() => {
}
}
-.app-select-trigger {
+.trigger {
display: flex;
padding: 2px;
align-items: center;
justify-content: space-between;
}
+.trigger-button {
+ height: 30px;
+}
button,
.search-input {
diff --git a/frontend/app/components/AppTagInput.vue b/frontend/app/components/AppTagInput.vue
index 8b3f5281..39ec3ec4 100644
--- a/frontend/app/components/AppTagInput.vue
+++ b/frontend/app/components/AppTagInput.vue
@@ -1,7 +1,7 @@
<template>
<div class="tag-input">
<div v-for="(tag, index) in tagsArray" :key="index">
- <tag class="primary" style="padding: 5px 6px">{{ tag }}<button type="button" class="remove" @click="removeTag(index)">Γ—</button></tag>
+ <tag class="primary tag">{{ tag }}<button type="button" class="remove" @click="removeTag(index)">Γ—</button></tag>
</div>
<input v-model="input" placeholder="Add a tag (enter to add)" @keydown.enter.prevent="addTag" @keydown.delete="removeLastTag" />
@@ -53,6 +53,9 @@ function removeLastTag() {
align-items: center;
flex-wrap: wrap;
}
+.tag {
+ padding: 5px 6px;
+}
button {
margin: 0;
diff --git a/frontend/app/components/CommandCenter/index.vue b/frontend/app/components/CommandCenter/index.vue
index 278337d0..bbb79c4c 100644
--- a/frontend/app/components/CommandCenter/index.vue
+++ b/frontend/app/components/CommandCenter/index.vue
@@ -60,7 +60,6 @@ import CreateCategoryModal from '~/pages/dashboard/categories/_modals/CreateCate
import TabNavigation from './TabNavigation.vue';
import QuickSearchTab from './QuickSearchTab.vue';
import AdvancedSearchTab from './AdvancedSearchTab.vue';
-import { useModal, Modal } from '~/composables/useModal';
import type { Node } from '~/stores';
const router = useRouter();
diff --git a/frontend/app/components/Kanban/KanbanCard.vue b/frontend/app/components/Kanban/KanbanCard.vue
index 8416db5b..eb451f70 100644
--- a/frontend/app/components/Kanban/KanbanCard.vue
+++ b/frontend/app/components/Kanban/KanbanCard.vue
@@ -6,9 +6,7 @@
<Icon :name="node.icon || 'file'" display="sm" />
</span>
- <NuxtLink :to="`/dashboard/docs/${node.id}`" class="card-title">
- {{ node.name }}
- </NuxtLink>
+ <NuxtLink :to="`/dashboard/docs/${node.id}`" class="card-title"> {{ node.name }} </NuxtLink>
</div>
<span v-if="node.order === -1" class="pin-badge" title="Pinned">
<Icon name="pin" />
@@ -29,10 +27,10 @@
import type { Node } from '~/stores';
const props = defineProps<{ node: Node; parent: Node }>();
-const emit = defineEmits<{
- dragStart: [node: Node];
- dragEnd: [];
-}>();
+const emit = defineEmits<{ dragStart: [node: Node]; dragEnd: [] }>();
+
+const { getAppColor } = useAppColors();
+const { shortDate } = useDateFormatters();
const parsedTags = computed(() => {
if (!props.node.tags) return [];
diff --git a/frontend/app/components/Loader.vue b/frontend/app/components/Loader.vue
index 34d979e1..9da234f3 100644
--- a/frontend/app/components/Loader.vue
+++ b/frontend/app/components/Loader.vue
@@ -4,6 +4,7 @@
<style scoped>
.loader {
+ margin: 4px auto;
width: 25px;
background: var(--c) 0% 50%, var(--c) 50% 50%, var(--c) 100% 50%;
background-size: 20% 100%;
diff --git a/frontend/app/components/Node/DeleteNodeModal.vue b/frontend/app/components/Node/DeleteNodeModal.vue
index 84daedc2..248a14ed 100644
--- a/frontend/app/components/Node/DeleteNodeModal.vue
+++ b/frontend/app/components/Node/DeleteNodeModal.vue
@@ -2,7 +2,7 @@
<div class="modal">
<h3>Delete {{ nodeType }}</h3>
<p>Are you sure you want to delete this {{ nodeType }} ?</p>
- <p style="opacity: 0.7">This action is irreversible</p>
+ <p class="description">This action is irreversible</p>
<p v-if="allChildren.length > 0" class="warn">This {{ nodeType }} has {{ allChildren.length }} child documents. They will be deleted too.</p>
<div class="footer">
<AppButton type="secondary" @click="emit('close')">Cancel</AppButton>
@@ -44,6 +44,9 @@ const deleteDoc = () => {
</script>
<style scoped lang="scss">
+.description {
+ opacity: 0.7;
+}
.warn {
color: var(--red-dark);
opacity: 0.7;
diff --git a/frontend/app/components/Node/NodeList.vue b/frontend/app/components/Node/NodeList.vue
index ac27344f..508032d5 100644
--- a/frontend/app/components/Node/NodeList.vue
+++ b/frontend/app/components/Node/NodeList.vue
@@ -62,7 +62,7 @@
description="There are no documents in this category"
>
<NuxtLink to="/dashboard/docs/new">
- <AppButton type="link" style="font-weight: bold">+ Create new document</AppButton>
+ <AppButton type="link">+ Create new document</AppButton>
</NuxtLink>
</NoContent>
</div>
diff --git a/frontend/app/components/Node/NodeMetadata.modal.vue b/frontend/app/components/Node/NodeMetadata.modal.vue
index fb1a49bf..fbff658c 100644
--- a/frontend/app/components/Node/NodeMetadata.modal.vue
+++ b/frontend/app/components/Node/NodeMetadata.modal.vue
@@ -20,7 +20,7 @@
<template v-if="node.role == 3">
<label for="thumbnail">Thumbnail <AppHint text="SVG supported" /></label>
<textarea id="thumbnail" v-model="node.thumbnail"></textarea>
- <div style="display: flex; align-items: center; gap: 10px">
+ <div class="inline-input">
<label for="pinned">Pinned</label>
<AppToggle id="pinned" v-model="pinnedToggle" />
</div>
@@ -33,7 +33,7 @@
:nullable="true"
:disabled="(i) => i.id == node.id || nodeStore.isDescendant(node, (i as Item).id)"
/>
- <div style="display: flex; align-items: center; gap: 10px">
+ <div class="inline-input">
<label for="accessibility">Color</label>
<AppColorPicker v-model="node.color" :nullable="true" />
</div>
@@ -66,6 +66,12 @@ watch(
flex-direction: column;
}
+.inline-input {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+}
+
form {
padding: 0 5px 25px;
flex: 1;
diff --git a/frontend/app/components/Node/NodePermissions.modal.vue b/frontend/app/components/Node/NodePermissions.modal.vue
index 9645b681..1467ae5e 100644
--- a/frontend/app/components/Node/NodePermissions.modal.vue
+++ b/frontend/app/components/Node/NodePermissions.modal.vue
@@ -37,7 +37,7 @@
</div>
</div>
</div>
- <Loader v-if="isLoading" style="margin: 4px auto" />
+ <Loader v-if="isLoading" />
<p v-else-if="searchError" class="info-secondary">{{ searchError }}</p>
</form>
@@ -55,7 +55,7 @@
<div class="user-actions">
<AppSelect v-model="perm.permission" :items="NODE_PERMISSIONS" :searchable="false" size="250px" @update:model-value="updatePermission(perm)">
<template #list-footer>
- <hr style="margin: 4px 0" />
+ <hr />
<AppSelectNode :level="0" :node="{ id: `$rm-${perm.id}`, label: 'Remove permission' }" @select="removePermission(perm)" />
</template>
</AppSelect>
diff --git a/frontend/app/components/Sidebar/Sidebar.vue b/frontend/app/components/Sidebar/Sidebar.vue
index 562cf4f6..28832033 100644
--- a/frontend/app/components/Sidebar/Sidebar.vue
+++ b/frontend/app/components/Sidebar/Sidebar.vue
@@ -6,14 +6,14 @@
<section class="header">
<span class="name">
<IconApp />
- <NuxtLink style="font-family: Arial; font-size: 19px; font-weight: 600" to="/dashboard">Alexandrie</NuxtLink>
+ <NuxtLink class="home-link" to="/dashboard">Alexandrie</NuxtLink>
</span>
<IconClose class="btn" />
</section>
<input v-model="filter" type="text" placeholder="Search or ctrl + q" />
<div v-if="userStore.user" class="user">
- <img :src="avatarURL(userStore.user)" alt="Avatar" style="width: 25px; height: 25px; border-radius: 50%" />
+ <img :src="avatarURL(userStore.user)" alt="Avatar" class="avatar" />
<div class="details">
<NuxtLink to="/dashboard/settings?p=profile">
<div>{{ userStore.user.username }}</div>
@@ -121,6 +121,12 @@ onBeforeUnmount(() => {
}
}
+.home-link {
+ font-family: Arial;
+ font-size: 19px;
+ font-weight: 600;
+}
+
.header {
display: flex;
height: 50px;
@@ -197,6 +203,11 @@ input {
color: var(--font-color-light);
}
}
+ .avatar {
+ width: 25px;
+ height: 25px;
+ border-radius: 50%;
+ }
}
.compact:deep(.item) {
diff --git a/frontend/app/components/Sidebar/SidebarWorkspace.vue b/frontend/app/components/Sidebar/SidebarWorkspace.vue
index dfce1922..a7db5fea 100644
--- a/frontend/app/components/Sidebar/SidebarWorkspace.vue
+++ b/frontend/app/components/Sidebar/SidebarWorkspace.vue
@@ -1,7 +1,7 @@
<template>
<div class="workspace-item">
<span class="workspace-name">
- <Icon :name="option.meta?.icon || 'workspace'" size="22" :class="[appColors.getAppColor(option.meta?.color), 'icon']" />
+ <Icon :name="option.meta?.icon || 'workspace'" size="22" :class="[getAppColor(option.meta?.color), 'icon']" />
{{ option.text }}
</span>
<span>
@@ -15,7 +15,7 @@ import type { Workspace } from './helpers';
defineProps<{ option: Workspace }>();
-const appColors = useAppColors();
+const { getAppColor } = useAppColors();
</script>
<style scoped lang="scss">
diff --git a/frontend/app/components/Sidebar/SidebarWorkspaces.vue b/frontend/app/components/Sidebar/SidebarWorkspaces.vue
index e4bcb340..aaecb48d 100644
--- a/frontend/app/components/Sidebar/SidebarWorkspaces.vue
+++ b/frontend/app/components/Sidebar/SidebarWorkspaces.vue
@@ -2,7 +2,7 @@
<div class="dropdown-container" @click.stop="toggleDropdown">
<!-- stop propagation to avoid closing sidebar on mobile -->
<div class="dropdown-selected" :class="{ open: isOpen }">
- <span v-if="selectedOption" style="flex: 1"><SidebarWorkspace :option="selectedOption" /></span>
+ <span v-if="selectedOption" class="selected"><SidebarWorkspace :option="selectedOption" /></span>
<Icon name="expand" display="sm" />
</div>
<ul v-if="isOpen" class="dropdown-options">
@@ -12,12 +12,12 @@
<li :class="{ selected: shared_workspaces.value === workspaceId }" @click="selectOption(shared_workspaces)">
<SidebarWorkspace :option="shared_workspaces" />
</li>
- <hr style="margin: 2px 0" />
- <span style="margin: 4px 6px; font-size: small; font-weight: 600; color: var(--font-color-light)">Workspaces</span>
+ <hr />
+ <span class="workspaces-label">Workspaces</span>
<li v-for="option in options" :key="option.meta?.id" :class="{ selected: option.value === workspaceId }" @click="selectOption(option)">
<SidebarWorkspace :option="option" />
</li>
- <div v-if="!options.length" class="placeholder" style="padding: 6px; font-size: 0.9rem; font-style: italic">No workspaces found</div>
+ <div v-if="!options.length" class="placeholder">No workspaces found</div>
<hr />
<div class="new-workspace" @click="create_workspace"><Icon name="plus" fill="var(--font-color-light)" /> New Workspace</div>
<NuxtLink :to="`/dashboard/categories/${selectedOption.value}/edit`" class="new-workspace"
@@ -91,9 +91,15 @@ const create_workspace = (_: MouseEvent) => useModal().add(new Modal(shallowRef(
transition: transform 0.2s ease;
}
}
+.selected {
+ flex: 1;
+}
.placeholder {
color: var(--font-color-light);
+ padding: 6px;
+ font-size: 0.9rem;
+ font-style: italic;
}
.dropdown-selected.open {
@@ -160,6 +166,14 @@ hr {
border-top: 1px solid var(--border-color-light);
}
+.workspaces-label {
+ display: block;
+ margin: 4px 6px;
+ font-size: small;
+ font-weight: 600;
+ color: var(--font-color-light);
+}
+
.new-workspace {
display: flex;
margin: 2px 0;
diff --git a/frontend/app/pages/dashboard/settings/_views/snippets.vue b/frontend/app/pages/dashboard/settings/_views/snippets.vue
index 34060c53..f448fad3 100644
--- a/frontend/app/pages/dashboard/settings/_views/snippets.vue
+++ b/frontend/app/pages/dashboard/settings/_views/snippets.vue
@@ -113,8 +113,8 @@
</template>
<script setup lang="ts">
-import { DEFAULT_PREFERENCES } from '~/composables/Preferences';
const preferences = usePreferences();
+
const snippets = preferences.get('snippets');
// Reactive state
@@ -125,15 +125,15 @@ const editingIndex = ref<number | null>(null);
const editingSnippet = ref<{ id: string; label: string }>({ id: '', label: '' });
const originalSnippet = ref<{ id: string; label: string }>({ id: '', label: '' });
-// Temporary snippet creation
const creatingSnippet = ref(false);
+const fileInput = ref<HTMLInputElement | null>(null);
const newSnippet = ref<{ id: string; label: string }>({ id: '', label: '' });
const sortOptions = [
{ id: 'shortcut', label: 'Sort by Shortcut' },
{ id: 'content', label: 'Sort by Content' },
{ id: 'usage', label: 'Sort by Usage' },
];
-// Computed
+
const filteredSnippets = computed(() => {
return snippets.value
.filter(
@@ -161,8 +161,6 @@ function cancelNewSnippet() {
newSnippet.value = { id: '', label: '' };
}
-const fileInput = ref<HTMLInputElement | null>(null);
-
function removeSnippet(index: number) {
const actualIndex = findActualIndex(index);
if (actualIndex !== -1) {
diff --git a/frontend/app/styles/theme.scss b/frontend/app/styles/theme.scss
index 1b4502d4..25607d35 100644
--- a/frontend/app/styles/theme.scss
+++ b/frontend/app/styles/theme.scss
@@ -85,9 +85,9 @@ h6 {
}
hr {
- width: 98%;
+ width: 100%;
height: 1px;
- margin: 0 auto;
+ margin: 2px auto;
border: none;
color: var(--border-color);
background-color: var(--border-color);