Compare commits

...

3 Commits

Author SHA1 Message Date
syuilo d07552424c 🎨 2025-04-02 19:48:32 +09:00
syuilo e4ceab5f6c Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2025-04-02 19:16:18 +09:00
syuilo e1dc1e5111 🎨 2025-04-02 19:16:16 +09:00
9 changed files with 19 additions and 8 deletions

4
locales/index.d.ts vendored
View File

@ -5378,6 +5378,10 @@ export interface Locale extends ILocale {
* *
*/ */
"top": string; "top": string;
/**
*
*/
"embed": string;
"_chat": { "_chat": {
/** /**
* *

View File

@ -1340,6 +1340,7 @@ compress: "圧縮"
right: "右" right: "右"
bottom: "下" bottom: "下"
top: "上" top: "上"
embed: "埋め込み"
_chat: _chat:
noMessagesYet: "まだメッセージはありません" noMessagesYet: "まだメッセージはありません"

View File

@ -7,9 +7,9 @@
bg: '#232125', bg: '#232125',
fg: '#efdab9', fg: '#efdab9',
link: '#78b0a0', link: '#78b0a0',
warn: '#ecb637', warn: '#ffd152',
badge: '#31b1ce', badge: '#31b1ce',
error: '#ec4137', error: '#ff6652',
focus: ':alpha<0.3<@accent', focus: ':alpha<0.3<@accent',
navBg: '@panel', navBg: '@panel',
navFg: '@fg', navFg: '@fg',
@ -24,7 +24,7 @@
hashtag: '#ff9156', hashtag: '#ff9156',
mention: '#ffd152', mention: '#ffd152',
modalBg: 'rgba(0, 0, 0, 0.5)', modalBg: 'rgba(0, 0, 0, 0.5)',
success: '#86b300', success: '#78b07f',
indicator: '@accent', indicator: '@accent',
mentionMe: '#fb5d38', mentionMe: '#fb5d38',
messageBg: '@bg', messageBg: '@bg',

View File

@ -22,5 +22,8 @@
mentionMe: 'rgb(212, 210, 76)', mentionMe: 'rgb(212, 210, 76)',
hashtag: '#5bcbb0', hashtag: '#5bcbb0',
link: '@accent', link: '@accent',
success: '@accent',
warn: 'rgb(255, 213, 82)',
error: 'rgb(255, 105, 82)',
}, },
} }

View File

@ -22,5 +22,8 @@
mentionMe: '#de6161', mentionMe: '#de6161',
hashtag: '#68bad0', hashtag: '#68bad0',
link: '#a1c758', link: '#a1c758',
error: '#ce5441',
warn: '#d0b868',
success: '#a1c758',
}, },
} }

View File

@ -150,7 +150,7 @@ const headerActions = computed(() => clip.value && isOwned.value ? [{
}, },
}, { }, {
icon: 'ti ti-code', icon: 'ti ti-code',
text: i18n.ts.genEmbedCode, text: i18n.ts.embed,
action: () => { action: () => {
genEmbedCode('clips', clip.value!.id); genEmbedCode('clips', clip.value!.id);
}, },

View File

@ -56,7 +56,7 @@ const headerActions = computed(() => [{
label: i18n.ts.more, label: i18n.ts.more,
handler: (ev: MouseEvent) => { handler: (ev: MouseEvent) => {
os.popupMenu([{ os.popupMenu([{
text: i18n.ts.genEmbedCode, text: i18n.ts.embed,
icon: 'ti ti-code', icon: 'ti ti-code',
action: () => { action: () => {
genEmbedCode('tags', props.tag); genEmbedCode('tags', props.tag);

View File

@ -331,7 +331,7 @@ export function getNoteMenu(props: {
}, },
}); });
} else { } else {
menuItems.push(getNoteEmbedCodeMenu(appearNote, i18n.ts.genEmbedCode)); menuItems.push(getNoteEmbedCodeMenu(appearNote, i18n.ts.embed));
} }
if (isSupportShare()) { if (isSupportShare()) {
@ -489,7 +489,7 @@ export function getNoteMenu(props: {
}, },
}); });
} else { } else {
menuItems.push(getNoteEmbedCodeMenu(appearNote, i18n.ts.genEmbedCode)); menuItems.push(getNoteEmbedCodeMenu(appearNote, i18n.ts.embed));
} }
} }

View File

@ -198,7 +198,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
} else { } else {
menuItems.push({ menuItems.push({
icon: 'ti ti-code', icon: 'ti ti-code',
text: i18n.ts.genEmbedCode, text: i18n.ts.embed,
type: 'parent', type: 'parent',
children: [{ children: [{
text: i18n.ts.noteOfThisUser, text: i18n.ts.noteOfThisUser,