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: cleanup less files

Stevencfc5599334b4
diff --git a/web/src/components/MemoFilter.tsx b/web/src/components/MemoFilter.tsx
index e3197cea6..fdeadd5ce 100644
--- a/web/src/components/MemoFilter.tsx
+++ b/web/src/components/MemoFilter.tsx
@@ -4,7 +4,6 @@ import { getDateString } from "@/helpers/datetime";
import { useFilterStore } from "@/store/module";
import { useTranslate } from "@/utils/i18n";
import Icon from "./Icon";
-import "@/less/memo-filter.less";
const MemoFilter = () => {
const t = useTranslate();
@@ -19,34 +18,44 @@ const MemoFilter = () => {
}, [location]);
return (
- <div className={`filter-query-container ${showFilter ? "" : "!hidden"}`}>
+ <div
+ className={`flex flex-row justify-start items-start w-full flex-wrap px-2 pb-2 text-sm font-mono leading-7 dark:text-gray-300 ${
+ showFilter ? "" : "!hidden"
+ }`}
+ >
<span className="mx-2 text-gray-400">{t("common.filter")}:</span>
<div
- className={"filter-item-container " + (tagQuery ? "" : "!hidden")}
+ className={
+ "max-w-xs flex flex-row justify-start items-center px-2 mr-2 cursor-pointer dark:text-gray-300 bg-gray-200 dark:bg-zinc-700 rounded whitespace-nowrap truncate hover:line-through " +
+ (tagQuery ? "" : "!hidden")
+ }
onClick={() => {
filterStore.setTagFilter(undefined);
}}
>
- <Icon.Tag className="icon-text" /> {tagQuery}
+ <Icon.Tag className="w-4 h-auto mr-1 text-gray-500 dark:text-gray-400" /> {tagQuery}
<Icon.X className="w-4 h-auto ml-1 opacity-40" />
</div>
<div
- className={"filter-item-container " + (visibility ? "" : "!hidden")}
+ className={
+ "max-w-xs flex flex-row justify-start items-center px-2 mr-2 cursor-pointer dark:text-gray-300 bg-gray-200 dark:bg-zinc-700 rounded whitespace-nowrap truncate hover:line-through " +
+ (visibility ? "" : "!hidden")
+ }
onClick={() => {
filterStore.setMemoVisibilityFilter(undefined);
}}
>
- <Icon.Eye className="icon-text" /> {visibility}
+ <Icon.Eye className="w-4 h-auto mr-1 text-gray-500 dark:text-gray-400" /> {visibility}
<Icon.X className="w-4 h-auto ml-1 opacity-40" />
</div>
{duration && duration.from < duration.to ? (
<div
- className="filter-item-container"
+ className="max-w-xs flex flex-row justify-start items-center px-2 mr-2 cursor-pointer dark:text-gray-300 bg-gray-200 dark:bg-zinc-700 rounded whitespace-nowrap truncate hover:line-through"
onClick={() => {
filterStore.setFromAndToFilter();
}}
>
- <Icon.Calendar className="icon-text" />
+ <Icon.Calendar className="w-4 h-auto mr-1 text-gray-500 dark:text-gray-400" />
{t("common.filter-period", {
from: getDateString(duration.from),
to: getDateString(duration.to),
@@ -56,12 +65,15 @@ const MemoFilter = () => {
</div>
) : null}
<div
- className={"filter-item-container " + (textQuery ? "" : "!hidden")}
+ className={
+ "max-w-xs flex flex-row justify-start items-center px-2 mr-2 cursor-pointer dark:text-gray-300 bg-gray-200 dark:bg-zinc-700 rounded whitespace-nowrap truncate hover:line-through " +
+ (textQuery ? "" : "!hidden")
+ }
onClick={() => {
filterStore.setTextFilter(undefined);
}}
>
- <Icon.Search className="icon-text" /> {textQuery}
+ <Icon.Search className="w-4 h-auto mr-1 text-gray-500 dark:text-gray-400" /> {textQuery}
<Icon.X className="w-4 h-auto ml-1 opacity-40" />
</div>
</div>
diff --git a/web/src/components/MemoList.tsx b/web/src/components/MemoList.tsx
index 203c5c7b9..4cd9fcbe0 100644
--- a/web/src/components/MemoList.tsx
+++ b/web/src/components/MemoList.tsx
@@ -9,7 +9,6 @@ import { useFilterStore, useMemoStore } from "@/store/module";
import { useTranslate } from "@/utils/i18n";
import Empty from "./Empty";
import Memo from "./Memo";
-import "@/less/memo-list.less";
const MemoList: React.FC = () => {
const t = useTranslate();
@@ -131,17 +130,17 @@ const MemoList: React.FC = () => {
};
return (
- <div className="memo-list-container">
+ <div className="flex flex-col justify-start items-start w-full max-w-full overflow-y-scroll pb-28 hide-scrollbar">
{sortedMemos.map((memo) => (
<Memo key={`${memo.id}-${memo.displayTs}`} memo={memo} lazyRendering showVisibility />
))}
{isFetching ? (
- <div className="status-text-container fetching-tip">
- <p className="status-text">{t("memo.fetching-data")}</p>
+ <div className="flex flex-col justify-start items-center w-full mt-2 mb-1">
+ <p className="text-sm text-gray-400 italic">{t("memo.fetching-data")}</p>
</div>
) : (
- <div className="status-text-container">
- <div className="status-text">
+ <div className="flex flex-col justify-start items-center w-full my-6">
+ <div className="text-sm text-gray-400 italic">
{isComplete ? (
sortedMemos.length === 0 && (
<div className="w-full mt-12 mb-8 flex flex-col justify-center items-center italic">
diff --git a/web/src/components/MemoResourceListView.tsx b/web/src/components/MemoResourceListView.tsx
index ebb84ba03..517a860a7 100644
--- a/web/src/components/MemoResourceListView.tsx
+++ b/web/src/components/MemoResourceListView.tsx
@@ -5,7 +5,6 @@ import { getResourceType, getResourceUrl } from "@/utils/resource";
import MemoResource from "./MemoResource";
import showPreviewImageDialog from "./PreviewImageDialog";
import SquareDiv from "./kit/SquareDiv";
-import "@/less/memo-resources.less";
interface Props {
resourceList: Resource[];
@@ -77,14 +76,20 @@ const MemoResourceListView: React.FC<Props> = (props: Props) => {
</div>
))}
- <div className={`resource-wrapper ${className || ""}`}>
+ <div className={`w-full flex flex-col justify-start items-start ${className || ""}`}>
{videoResourceList.length > 0 && (
- <div className="images-wrapper">
+ <div className="w-full grid grid-cols-2 sm:grid-cols-3 gap-2 mt-2wrapper">
{videoResourceList.map((resource) => {
const url = getResourceUrl(resource);
return (
- <SquareDiv key={resource.id} className="memo-resource">
- <video preload="metadata" crossOrigin="anonymous" src={absolutifyLink(url)} controls></video>
+ <SquareDiv key={resource.id} className="shadow rounded overflow-hidden hide-scrollbar">
+ <video
+ className="cursor-pointer w-full h-full object-contain bg-zinc-100 dark:bg-zinc-800"
+ preload="metadata"
+ crossOrigin="anonymous"
+ src={absolutifyLink(url)}
+ controls
+ ></video>
</SquareDiv>
);
})}
diff --git a/web/src/less/archived.less b/web/src/less/archived.less
deleted file mode 100644
index 8f696707e..000000000
--- a/web/src/less/archived.less
+++ /dev/null
@@ -1,11 +0,0 @@
-.archived-memo-page {
- @apply w-full max-w-3xl min-h-full flex flex-col justify-start items-center pb-8 bg-zinc-100 dark:bg-zinc-800;
-
- > .tip-text-container {
- @apply w-full h-32 flex flex-col justify-center items-center;
- }
-
- > .archived-memos-container {
- @apply w-full flex flex-col justify-start items-start;
- }
-}
diff --git a/web/src/less/change-resource-filename-dialog.less b/web/src/less/change-resource-filename-dialog.less
deleted file mode 100644
index 56c3d1ebf..000000000
--- a/web/src/less/change-resource-filename-dialog.less
+++ /dev/null
@@ -1,13 +0,0 @@
-.change-resource-filename-dialog {
- > .dialog-container {
- @apply w-72;
-
- > .dialog-content-container {
- @apply flex flex-col justify-start items-start;
-
- > .btns-container {
- @apply flex flex-row justify-end items-center mt-2 w-full;
- }
- }
- }
-}
diff --git a/web/src/less/image.less b/web/src/less/image.less
deleted file mode 100644
index 7e464e9c1..000000000
--- a/web/src/less/image.less
+++ /dev/null
@@ -1,8 +0,0 @@
-.image-container {
- @apply hide-scrollbar;
- -webkit-tap-highlight-color: transparent;
-
- > img {
- @apply w-full h-auto;
- }
-}
diff --git a/web/src/less/memo-content.less b/web/src/less/memo-content.less
index 20cdbb309..ef21e40dc 100644
--- a/web/src/less/memo-content.less
+++ b/web/src/less/memo-content.less
@@ -105,27 +105,4 @@
@apply my-1 dark:border-zinc-600;
}
}
-
- > .expand-btn-container {
- @apply w-full relative flex flex-row justify-start items-center z-1;
- > .btn {
- @apply flex flex-row justify-start items-center pl-2 pr-1 py-1 my-2 text-xs rounded-lg border bg-gray-100 dark:bg-zinc-600 border-gray-200 dark:border-zinc-600 shadow hover:opacity-90 cursor-pointer;
-
- &.expand-btn {
- > .icon-img {
- @apply rotate-90;
- }
- }
-
- &.fold-btn {
- > .icon-img {
- @apply -rotate-90;
- }
- }
-
- > .icon-img {
- @apply w-4 h-auto ml-1 transition-all;
- }
- }
- }
}
diff --git a/web/src/less/memo-filter.less b/web/src/less/memo-filter.less
deleted file mode 100644
index e3003c514..000000000
--- a/web/src/less/memo-filter.less
+++ /dev/null
@@ -1,12 +0,0 @@
-.filter-query-container {
- @apply flex flex-row justify-start items-start w-full flex-wrap px-2 pb-2 text-sm font-mono leading-7 dark:text-gray-300;
-
- > .filter-item-container {
- @apply flex flex-row justify-start items-center px-2 mr-2 cursor-pointer dark:text-gray-300 bg-gray-200 dark:bg-zinc-700 rounded whitespace-nowrap truncate hover:line-through;
- max-width: 256px;
-
- > .icon-text {
- @apply w-4 h-auto mr-1 text-gray-500 dark:text-gray-400;
- }
- }
-}
diff --git a/web/src/less/memo-list.less b/web/src/less/memo-list.less
deleted file mode 100644
index d11a1ff0b..000000000
--- a/web/src/less/memo-list.less
+++ /dev/null
@@ -1,15 +0,0 @@
-.memo-list-container {
- @apply flex flex-col justify-start items-start w-full max-w-full overflow-y-scroll pb-28 hide-scrollbar;
-
- > .status-text-container {
- @apply flex flex-col justify-start items-center w-full my-6;
-
- &.fetching-tip {
- @apply mt-2 mb-1;
- }
-
- > .status-text {
- @apply text-sm text-gray-400 italic;
- }
- }
-}
diff --git a/web/src/less/memo-resources.less b/web/src/less/memo-resources.less
deleted file mode 100644
index fab38f2b9..000000000
--- a/web/src/less/memo-resources.less
+++ /dev/null
@@ -1,19 +0,0 @@
-.resource-wrapper {
- @apply w-full flex flex-col justify-start items-start;
-
- > .images-wrapper {
- @apply w-full grid grid-cols-2 sm:grid-cols-3 gap-2 mt-2;
-
- > .memo-resource {
- @apply shadow rounded overflow-hidden hide-scrollbar;
-
- > img {
- @apply cursor-pointer min-h-full w-auto min-w-full object-cover;
- }
-
- > video {
- @apply cursor-pointer w-full h-full object-contain bg-zinc-100 dark:bg-zinc-800;
- }
- }
- }
-}
diff --git a/web/src/less/resources-selector-dialog.less b/web/src/less/resources-selector-dialog.less
deleted file mode 100644
index 034e08acb..000000000
--- a/web/src/less/resources-selector-dialog.less
+++ /dev/null
@@ -1,51 +0,0 @@
-.resources-selector-dialog {
- @apply px-4;
-
- > .dialog-container {
- @apply w-112 max-w-full mb-8;
-
- > .dialog-content-container {
- @apply flex flex-col justify-start items-start w-full;
-
- > .loading-text-container {
- @apply flex flex-col justify-center items-center w-full h-32;
- }
-
- > .resource-table-container {
- @apply flex flex-col justify-start items-start w-full;
-
- > .fields-container {
- @apply px-2 py-2 w-full grid grid-cols-7 border-b dark:border-b-gray-500;
-
- > .field-text {
- @apply font-mono text-gray-400;
- }
- }
-
- > .tip-text {
- @apply w-full text-center text-base my-6 mt-8;
- }
-
- > .resource-container {
- @apply px-2 py-2 w-full grid grid-cols-7 dark:bg-zinc-700;
-
- > .buttons-container {
- @apply w-full flex flex-row justify-end items-center;
- }
- }
-
- .field-text {
- @apply w-full truncate text-base pr-2 last:pr-0;
-
- &.name-text {
- @apply col-span-4;
- }
-
- &.type-text {
- @apply col-span-2;
- }
- }
- }
- }
- }
-}
diff --git a/web/src/pages/Archived.tsx b/web/src/pages/Archived.tsx
index e3f3cb2a6..1a2f0ce8c 100644
--- a/web/src/pages/Archived.tsx
+++ b/web/src/pages/Archived.tsx
@@ -7,7 +7,6 @@ import MobileHeader from "@/components/MobileHeader";
import useLoading from "@/hooks/useLoading";
import { useFilterStore, useMemoStore } from "@/store/module";
import { useTranslate } from "@/utils/i18n";
-import "@/less/archived.less";
const Archived = () => {
const t = useTranslate();
@@ -38,25 +37,23 @@ const Archived = () => {
return (
<section className="w-full max-w-3xl min-h-full flex flex-col justify-start items-start px-4 sm:px-2 sm:pt-4 pb-8 bg-zinc-100 dark:bg-zinc-800">
<MobileHeader showSearch={false} />
- <div className="archived-memo-page">
- <MemoFilter />
- {loadingState.isLoading ? (
- <div className="tip-text-container">
- <p className="tip-text">{t("memo.fetching-data")}</p>
- </div>
- ) : archivedMemos.length === 0 ? (
- <div className="w-full mt-16 mb-8 flex flex-col justify-center items-center italic">
- <Empty />
- <p className="mt-4 text-gray-600 dark:text-gray-400">{t("message.no-data")}</p>
- </div>
- ) : (
- <div className="archived-memos-container">
- {archivedMemos.map((memo) => (
- <ArchivedMemo key={`${memo.id}-${memo.updatedTs}`} memo={memo} />
- ))}
- </div>
- )}
- </div>
+ <MemoFilter />
+ {loadingState.isLoading ? (
+ <div className="w-full h-32 flex flex-col justify-center items-center">
+ <p className="opacity-70">{t("memo.fetching-data")}</p>
+ </div>
+ ) : archivedMemos.length === 0 ? (
+ <div className="w-full mt-16 mb-8 flex flex-col justify-center items-center italic">
+ <Empty />
+ <p className="mt-4 text-gray-600 dark:text-gray-400">{t("message.no-data")}</p>
+ </div>
+ ) : (
+ <div className="w-full flex flex-col justify-start items-start">
+ {archivedMemos.map((memo) => (
+ <ArchivedMemo key={`${memo.id}-${memo.updatedTs}`} memo={memo} />
+ ))}
+ </div>
+ )}
</section>
);
};