diff --git a/locales/en-US.yml b/locales/en-US.yml index 3649e97011..f4913e9041 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1230,13 +1230,13 @@ _sfx: _ago: future: "Future" justNow: "Just now" - secondsAgo: "{n} second(s) ago" - minutesAgo: "{n} minute(s) ago" - hoursAgo: "{n} hour(s) ago" - daysAgo: "{n} day(s) ago" - weeksAgo: "{n} week(s) ago" - monthsAgo: "{n} month(s) ago" - yearsAgo: "{n} year(s) ago" + secondsAgo: "{n}s ago" + minutesAgo: "{n}m ago" + hoursAgo: "{n}h ago" + daysAgo: "{n}d ago" + weeksAgo: "{n}w ago" + monthsAgo: "{n}mo ago" + yearsAgo: "{n}y ago" _time: second: "Second(s)" minute: "Minute(s)" diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index c02e79d005..f80aabbc92 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -10,16 +10,16 @@ :class="{ renote: isRenote }" > -
+
-
{{ i18n.ts.promotion }}
+
{{ i18n.ts.promotion }}
{{ i18n.ts.featured }}
{{ i18n.ts.pinnedNote }}
@@ -93,7 +93,6 @@ -
@@ -418,8 +417,8 @@ function readPromo() { align-items: center; white-space: pre; color: var(--renote); + cursor: pointer; - > i { margin-right: 4px; } @@ -504,7 +503,7 @@ function readPromo() { width: 100%; margin-top: 1em; position: sticky; - bottom: 1em; + bottom: var(--stickyBottom); > span { display: inline-block; @@ -663,6 +662,9 @@ function readPromo() { } > .line { margin-right: 10px; + &::before { + margin-top: 8px; + } } } > .article { diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue index a06bac3705..4eed184e22 100644 --- a/packages/client/src/components/MkNoteDetailed.vue +++ b/packages/client/src/components/MkNoteDetailed.vue @@ -352,6 +352,7 @@ onUnmounted(() => {