Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
canifa_note
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vũ Hoàng Anh
canifa_note
Commits
6cbe957d
Unverified
Commit
6cbe957d
authored
Sep 22, 2024
by
RoccoSmit
Committed by
GitHub
Sep 22, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: show future relative dates (#3946)
Show future relative dates
parent
0711ac4e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
EmbeddedMemo.tsx
...c/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx
+1
-1
MemoView.tsx
web/src/components/MemoView.tsx
+1
-1
Archived.tsx
web/src/pages/Archived.tsx
+1
-1
No files found.
web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx
View file @
6cbe957d
...
@@ -69,7 +69,7 @@ const EmbeddedMemo = ({ resourceId: uid, params: paramsStr }: Props) => {
...
@@ -69,7 +69,7 @@ const EmbeddedMemo = ({ resourceId: uid, params: paramsStr }: Props) => {
<
div
className=
"relative flex flex-col justify-start items-start w-full px-3 py-2 bg-zinc-50 dark:bg-zinc-900 rounded-lg border border-gray-200 dark:border-zinc-700 hover:shadow"
>
<
div
className=
"relative flex flex-col justify-start items-start w-full px-3 py-2 bg-zinc-50 dark:bg-zinc-900 rounded-lg border border-gray-200 dark:border-zinc-700 hover:shadow"
>
<
div
className=
"w-full mb-1 flex flex-row justify-between items-center text-gray-400 dark:text-gray-500"
>
<
div
className=
"w-full mb-1 flex flex-row justify-between items-center text-gray-400 dark:text-gray-500"
>
<
div
className=
"text-sm leading-5 select-none"
>
<
div
className=
"text-sm leading-5 select-none"
>
<
relative
-
time
datetime=
{
memo
.
displayTime
?.
toISOString
()
}
format=
"datetime"
tense=
"past"
></
relative
-
time
>
<
relative
-
time
datetime=
{
memo
.
displayTime
?.
toISOString
()
}
format=
"datetime"
></
relative
-
time
>
</
div
>
</
div
>
<
div
className=
"flex justify-end items-center gap-1"
>
<
div
className=
"flex justify-end items-center gap-1"
>
<
span
className=
"text-xs opacity-60 leading-5 cursor-pointer hover:opacity-80"
onClick=
{
()
=>
copyMemoUid
(
memo
.
uid
)
}
>
<
span
className=
"text-xs opacity-60 leading-5 cursor-pointer hover:opacity-80"
onClick=
{
()
=>
copyMemoUid
(
memo
.
uid
)
}
>
...
...
web/src/components/MemoView.tsx
View file @
6cbe957d
...
@@ -95,7 +95,7 @@ const MemoView: React.FC<Props> = (props: Props) => {
...
@@ -95,7 +95,7 @@ const MemoView: React.FC<Props> = (props: Props) => {
props
.
displayTimeFormat
===
"time"
?
(
props
.
displayTimeFormat
===
"time"
?
(
memo
.
displayTime
?.
toLocaleTimeString
()
memo
.
displayTime
?.
toLocaleTimeString
()
)
:
(
)
:
(
<
relative
-
time
datetime=
{
memo
.
displayTime
?.
toISOString
()
}
format=
{
relativeTimeFormat
}
tense=
"past"
></
relative
-
time
>
<
relative
-
time
datetime=
{
memo
.
displayTime
?.
toISOString
()
}
format=
{
relativeTimeFormat
}
></
relative
-
time
>
);
);
return
(
return
(
...
...
web/src/pages/Archived.tsx
View file @
6cbe957d
...
@@ -91,7 +91,7 @@ const Archived = () => {
...
@@ -91,7 +91,7 @@ const Archived = () => {
<
div
className=
"w-full mb-1 flex flex-row justify-between items-center"
>
<
div
className=
"w-full mb-1 flex flex-row justify-between items-center"
>
<
div
className=
"w-full max-w-[calc(100%-20px)] flex flex-row justify-start items-center mr-1"
>
<
div
className=
"w-full max-w-[calc(100%-20px)] flex flex-row justify-start items-center mr-1"
>
<
div
className=
"text-sm leading-6 text-gray-400 select-none"
>
<
div
className=
"text-sm leading-6 text-gray-400 select-none"
>
<
relative
-
time
datetime=
{
memo
.
displayTime
?.
toISOString
()
}
tense=
"past"
></
relative
-
time
>
<
relative
-
time
datetime=
{
memo
.
displayTime
?.
toISOString
()
}
></
relative
-
time
>
</
div
>
</
div
>
</
div
>
</
div
>
<
div
className=
"flex flex-row justify-end items-center gap-x-2"
>
<
div
className=
"flex flex-row justify-end items-center gap-x-2"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment