From deb8f731273436779fbc1a1b4fa2c265df2b634a Mon Sep 17 00:00:00 2001 From: Mar0xy Date: Fri, 22 Sep 2023 21:05:22 +0200 Subject: merge: develop branch commit 72f8f58fe8da217eb3176562516b0b7815c3ad5f Author: Insert5StarName Date: Fri Sep 22 20:37:36 2023 +0200 Partial Rebrand commit 918c80327c36bbb32ddf44fd7a5977e65c72f39f Author: Amelia Yukii <123300075+Insert5StarName@users.noreply.github.com> Date: Fri Sep 22 20:09:22 2023 +0200 Update FUNDING.yml commit b1d7aa5508e1da86fa92e3d79542ea7129439aaf Author: Amelia Yukii <123300075+Insert5StarName@users.noreply.github.com> Date: Fri Sep 22 17:57:44 2023 +0200 Update README.md --- packages/frontend/assets/about-icon.png | Bin 26568 -> 326726 bytes packages/frontend/assets/misskey.svg | 7 ------- packages/frontend/assets/sharkey.svg | 1 + packages/frontend/src/pages/about-misskey.vue | 15 +++++---------- packages/frontend/src/pages/welcome.entrance.a.vue | 2 +- packages/frontend/src/ui/classic.sidebar.vue | 2 +- 6 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 packages/frontend/assets/misskey.svg create mode 100644 packages/frontend/assets/sharkey.svg (limited to 'packages') diff --git a/packages/frontend/assets/about-icon.png b/packages/frontend/assets/about-icon.png index 15fd1e3731..d59263cd80 100644 Binary files a/packages/frontend/assets/about-icon.png and b/packages/frontend/assets/about-icon.png differ diff --git a/packages/frontend/assets/misskey.svg b/packages/frontend/assets/misskey.svg deleted file mode 100644 index 3fcb2d3ecb..0000000000 --- a/packages/frontend/assets/misskey.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/packages/frontend/assets/sharkey.svg b/packages/frontend/assets/sharkey.svg new file mode 100644 index 0000000000..82f8c8cfa8 --- /dev/null +++ b/packages/frontend/assets/sharkey.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue index 37c869f98e..bb776cc5a0 100644 --- a/packages/frontend/src/pages/about-misskey.vue +++ b/packages/frontend/src/pages/about-misskey.vue @@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
Misskey
+
Sharkey
v{{ version }}
@@ -25,24 +25,19 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.ts._aboutMisskey.about }}
{{ i18n.ts.learnMore }}
- I #Misskey + I #Sharkey
- + {{ i18n.ts._aboutMisskey.source }} - - - {{ i18n.ts._aboutMisskey.translation }} - - - + {{ i18n.ts._aboutMisskey.donate }} - +
diff --git a/packages/frontend/src/pages/welcome.entrance.a.vue b/packages/frontend/src/pages/welcome.entrance.a.vue index 998d942488..d446b198d1 100644 --- a/packages/frontend/src/pages/welcome.entrance.a.vue +++ b/packages/frontend/src/pages/welcome.entrance.a.vue @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- +
diff --git a/packages/frontend/src/ui/classic.sidebar.vue b/packages/frontend/src/ui/classic.sidebar.vue index 9172d51893..6f22a736f5 100644 --- a/packages/frontend/src/ui/classic.sidebar.vue +++ b/packages/frontend/src/ui/classic.sidebar.vue @@ -55,7 +55,7 @@ import { openAccountMenu as openAccountMenu_, $i } from '@/account.js'; import MkButton from '@/components/MkButton.vue'; // import { StickySidebar } from '@/scripts/sticky-sidebar.js'; // import { mainRouter } from '@/router.js'; -//import MisskeyLogo from '@assets/client/misskey.svg'; +//import MisskeyLogo from '@assets/client/sharkey.svg'; import { defaultStore } from '@/store.js'; import { instance } from '@/instance.js'; import { i18n } from '@/i18n.js'; -- cgit v1.2.3-freya