Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

chore: revert tagList

boojack13093b6f62e9
diff --git a/web/src/components/Sidebar.tsx b/web/src/components/Sidebar.tsx
index 6e422fa6f..498e91f6d 100644
--- a/web/src/components/Sidebar.tsx
+++ b/web/src/components/Sidebar.tsx
@@ -5,8 +5,9 @@ import showDailyMemoDiaryDialog from "./DailyMemoDiaryDialog";
import showSettingDialog from "./SettingDialog";
import showMemoTrashDialog from "./MemoTrashDialog";
import UserBanner from "./UserBanner";
-import ShortcutList from "./ShortcutList";
import UsageHeatMap from "./UsageHeatMap";
+import ShortcutList from "./ShortcutList";
+import TagList from "./TagList";
import "../less/siderbar.less";
interface Props {}
@@ -53,6 +54,7 @@ const Sidebar: React.FC<Props> = () => {
</button>
</div>
<ShortcutList />
+ <TagList />
</aside>
);
};
diff --git a/web/src/less/memo-trash-dialog.less b/web/src/less/memo-trash-dialog.less
index 10b084e1a..4ac35c52e 100644
--- a/web/src/less/memo-trash-dialog.less
+++ b/web/src/less/memo-trash-dialog.less
@@ -7,7 +7,7 @@
> .dialog-content-container {
.flex(column, flex-start, flex-start);
- @apply w-full overflow-y-scroll;
+ @apply w-full overflow-y-auto;
> .tip-text-container {
@apply w-full h-32;
diff --git a/web/src/less/shortcut-list.less b/web/src/less/shortcut-list.less
index cd4b8952b..6777b2e24 100644
--- a/web/src/less/shortcut-list.less
+++ b/web/src/less/shortcut-list.less
@@ -2,7 +2,7 @@
.shortcuts-wrapper {
.flex(column, flex-start, flex-start);
- @apply w-full py-0 px-2 mt-1 h-auto grow shrink flex-nowrap;
+ @apply w-full py-0 px-2 mt-2 h-auto shrink-0 flex-nowrap;
.hide-scroll-bar();
> .title-text {
diff --git a/web/src/less/tag-list.less b/web/src/less/tag-list.less
index a30a60fec..26769aee2 100644
--- a/web/src/less/tag-list.less
+++ b/web/src/less/tag-list.less
@@ -2,17 +2,16 @@
.tags-wrapper {
.flex(column, flex-start, flex-start);
- @apply px-2 w-full h-auto flex-nowrap pb-4 grow;
+ @apply px-2 w-full h-auto flex-nowrap pb-4 mt-2 grow;
.hide-scroll-bar();
> .title-text {
- @apply w-full py-1 px-4 text-xs opacity-50;
- color: @text-black;
+ @apply w-full py-1 px-4 text-xs font-mono text-gray-400;
}
> .tags-container {
.flex(column, flex-start, flex-start);
- @apply relative w-full h-auto flex-nowrap mb-2;
+ @apply relative w-full h-auto flex-nowrap mb-2 mt-1;
.subtags-container {
.flex(column, flex-start, flex-start);
@@ -80,7 +79,7 @@
@apply w-full mt-2 pl-4 text-xs text-gray-400;
> .code-text {
- @apply p-1 mx-1 text-blue-400 whitespace-pre-line bg-blue-100 rounded;
+ @apply p-1 mx-1 text-blue-400 font-mono whitespace-pre-line bg-blue-100 rounded;
}
}
}