summaryrefslogtreecommitdiff
path: root/packages/frontend/src
diff options
context:
space:
mode:
authorMar0xy <marie@kaifa.ch>2023-09-22 21:05:22 +0200
committerMar0xy <marie@kaifa.ch>2023-09-22 21:05:22 +0200
commitdeb8f731273436779fbc1a1b4fa2c265df2b634a (patch)
tree6edb255d056563385892c5109241d104a26e1474 /packages/frontend/src
parentupd: add switching between notes, notes with replies and notes with media on ... (diff)
downloadsharkey-deb8f731273436779fbc1a1b4fa2c265df2b634a.tar.gz
sharkey-deb8f731273436779fbc1a1b4fa2c265df2b634a.tar.bz2
sharkey-deb8f731273436779fbc1a1b4fa2c265df2b634a.zip
merge: develop branch
commit 72f8f58fe8da217eb3176562516b0b7815c3ad5f Author: Insert5StarName <anime@shourai.de> 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
Diffstat (limited to 'packages/frontend/src')
-rw-r--r--packages/frontend/src/pages/about-misskey.vue15
-rw-r--r--packages/frontend/src/pages/welcome.entrance.a.vue2
-rw-r--r--packages/frontend/src/ui/classic.sidebar.vue2
3 files changed, 7 insertions, 12 deletions
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
<div v-panel class="about">
<div ref="containerEl" class="container" :class="{ playing: easterEggEngine != null }">
<img src="/client-assets/about-icon.png" alt="" class="icon" draggable="false" @load="iconLoaded" @click="gravity"/>
- <div class="misskey">Misskey</div>
+ <div class="misskey">Sharkey</div>
<div class="version">v{{ version }}</div>
<span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }">
<MkCustomEmoji v-if="emoji.emoji[0] === ':'" class="emoji" :name="emoji.emoji" :normal="true" :noStyle="true"/>
@@ -25,24 +25,19 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._aboutMisskey.about }}<br><a href="https://misskey-hub.net/docs/misskey.html" target="_blank" class="_link">{{ i18n.ts.learnMore }}</a>
</div>
<div v-if="$i != null" style="text-align: center;">
- <MkButton primary rounded inline @click="iLoveMisskey">I <Mfm text="$[jelly ❤]"/> #Misskey</MkButton>
+ <MkButton primary rounded inline @click="iLoveMisskey">I <Mfm text="$[jelly ❤]"/> #Sharkey</MkButton>
</div>
<FormSection>
<div class="_formLinks">
- <FormLink to="https://github.com/misskey-dev/misskey" external>
+ <FormLink to="https://github.com/transfem-org/Sharkey" external>
<template #icon><i class="ti ti-code"></i></template>
{{ i18n.ts._aboutMisskey.source }}
<template #suffix>GitHub</template>
</FormLink>
- <FormLink to="https://crowdin.com/project/misskey" external>
- <template #icon><i class="ti ti-language-hiragana"></i></template>
- {{ i18n.ts._aboutMisskey.translation }}
- <template #suffix>Crowdin</template>
- </FormLink>
- <FormLink to="https://www.patreon.com/syuilo" external>
+ <FormLink to="https://ko-fi.com/transfem" external>
<template #icon><i class="ti ti-pig-money"></i></template>
{{ i18n.ts._aboutMisskey.donate }}
- <template #suffix>Patreon</template>
+ <template #suffix>Ko-Fi</template>
</FormLink>
</div>
</FormSection>
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
<XTimeline class="tl"/>
<div class="shape1"></div>
<div class="shape2"></div>
- <img src="/client-assets/misskey.svg" class="misskey"/>
+ <img src="/client-assets/sharkey.svg" class="misskey"/>
<div class="emojis">
<MkEmoji :normal="true" :noStyle="true" emoji="👍"/>
<MkEmoji :normal="true" :noStyle="true" emoji="❤"/>
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';