From f0fe8eceaf863ca66a2744cabcbbca7407592124 Mon Sep 17 00:00:00 2001 From: Mar0xy Date: Sat, 2 Dec 2023 13:09:25 +0100 Subject: [PATCH] upd: add option to select between note designs Adds the ability to choose between `Sharkey` or `Misskey` --- .../src/components/MkInstanceTicker.vue | 49 +- packages/frontend/src/components/MkNote.vue | 49 +- .../src/components/MkNoteDetailed.vue | 69 +- .../frontend/src/components/MkNoteHeader.vue | 153 +-- .../frontend/src/components/MkNoteSimple.vue | 2 +- .../frontend/src/components/MkNoteSub.vue | 80 +- packages/frontend/src/components/MkNotes.vue | 20 +- .../src/components/SkInstanceTicker.vue | 82 ++ packages/frontend/src/components/SkNote.vue | 1201 +++++++++++++++++ .../src/components/SkNoteDetailed.vue | 1082 +++++++++++++++ .../frontend/src/components/SkNoteHeader.vue | 265 ++++ .../frontend/src/components/SkNoteSimple.vue | 113 ++ .../frontend/src/components/SkNoteSub.vue | 545 ++++++++ packages/frontend/src/pages/note.vue | 7 +- .../frontend/src/pages/settings/general.vue | 6 + packages/frontend/src/store.ts | 4 + 16 files changed, 3404 insertions(+), 323 deletions(-) create mode 100644 packages/frontend/src/components/SkInstanceTicker.vue create mode 100644 packages/frontend/src/components/SkNote.vue create mode 100644 packages/frontend/src/components/SkNoteDetailed.vue create mode 100644 packages/frontend/src/components/SkNoteHeader.vue create mode 100644 packages/frontend/src/components/SkNoteSimple.vue create mode 100644 packages/frontend/src/components/SkNoteSub.vue diff --git a/packages/frontend/src/components/MkInstanceTicker.vue b/packages/frontend/src/components/MkInstanceTicker.vue index 4e2856388..f0650e48f 100644 --- a/packages/frontend/src/components/MkInstanceTicker.vue +++ b/packages/frontend/src/components/MkInstanceTicker.vue @@ -35,48 +35,51 @@ const faviconUrl = $computed(() => props.instance ? getProxiedImageUrlNullable(p const themeColor = instance.themeColor ?? '#777777'; const bg = { - //background: `linear-gradient(90deg, ${themeColor}, ${themeColor}00)`, - background: `${themeColor}`, + background: `linear-gradient(90deg, ${themeColor}, ${themeColor}00)`, }; diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 869164273..4da8f16df 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -47,14 +47,11 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
- -
- -
-
-
+
+ +
+ +

@@ -63,6 +60,7 @@ SPDX-License-Identifier: AGPL-3.0-only

({{ i18n.ts.private }}) + -
- {{ i18n.ts.loadConversation }} +
+
+ {{ i18n.ts.loadConversation }} +
+
+
@@ -39,29 +43,15 @@ SPDX-License-Identifier: AGPL-3.0-only
- -
-
-
-
- - - - bot - - - -
-
-
-
-
-
+
+
+ + + + bot
@@ -71,8 +61,9 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
+
@@ -82,6 +73,7 @@ SPDX-License-Identifier: AGPL-3.0-only

({{ i18n.ts.private }}) + diff --git a/packages/frontend/src/components/MkNoteHeader.vue b/packages/frontend/src/components/MkNoteHeader.vue index 9984c3774..6121db3f8 100644 --- a/packages/frontend/src/components/MkNoteHeader.vue +++ b/packages/frontend/src/components/MkNoteHeader.vue @@ -4,56 +4,19 @@ SPDX-License-Identifier: AGPL-3.0-only --> diff --git a/packages/frontend/src/components/MkNoteSimple.vue b/packages/frontend/src/components/MkNoteSimple.vue index 8ebd24b32..b1d4ed3f7 100644 --- a/packages/frontend/src/components/MkNoteSimple.vue +++ b/packages/frontend/src/components/MkNoteSimple.vue @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- +

diff --git a/packages/frontend/src/components/MkNoteSub.vue b/packages/frontend/src/components/MkNoteSub.vue index 822b4de83..3e33c7aa6 100644 --- a/packages/frontend/src/components/MkNoteSub.vue +++ b/packages/frontend/src/components/MkNoteSub.vue @@ -5,12 +5,11 @@ SPDX-License-Identifier: AGPL-3.0-only