🎨

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
🎨
2025-04-02 19:48:32 +09:00 · 2025-04-02 19:16:18 +09:00 · 2025-04-02 19:16:16 +09:00
9 changed files with 19 additions and 8 deletions
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@ -5378,6 +5378,10 @@ export interface Locale extends ILocale {
     * 上
     */
    "top": string;
+    /**
+     * 埋め込み
+     */
+    "embed": string;
    "_chat": {
        /**
         * まだメッセージはありません
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@ -1340,6 +1340,7 @@ compress: "圧縮"
 right: "右"
 bottom: "下"
 top: "上"
+embed: "埋め込み"

 _chat:
  noMessagesYet: "まだメッセージはありません"
--- a/packages/frontend-shared/themes/d-astro.json5
+++ b/packages/frontend-shared/themes/d-astro.json5
@ -7,9 +7,9 @@
 		bg: '#232125',
 		fg: '#efdab9',
 		link: '#78b0a0',
-		warn: '#ecb637',
+		warn: '#ffd152',
 		badge: '#31b1ce',
-		error: '#ec4137',
+		error: '#ff6652',
 		focus: ':alpha<0.3<@accent',
 		navBg: '@panel',
 		navFg: '@fg',
@ -24,7 +24,7 @@
 		hashtag: '#ff9156',
 		mention: '#ffd152',
 		modalBg: 'rgba(0, 0, 0, 0.5)',
-		success: '#86b300',
+		success: '#78b07f',
 		indicator: '@accent',
 		mentionMe: '#fb5d38',
 		messageBg: '@bg',
--- a/packages/frontend-shared/themes/d-botanical.json5
+++ b/packages/frontend-shared/themes/d-botanical.json5
@ -22,5 +22,8 @@
 		mentionMe: 'rgb(212, 210, 76)',
 		hashtag: '#5bcbb0',
 		link: '@accent',
+		success: '@accent',
+		warn: 'rgb(255, 213, 82)',
+		error: 'rgb(255, 105, 82)',
 	},
 }
--- a/packages/frontend-shared/themes/d-persimmon.json5
+++ b/packages/frontend-shared/themes/d-persimmon.json5
@ -22,5 +22,8 @@
 		mentionMe: '#de6161',
 		hashtag: '#68bad0',
 		link: '#a1c758',
+		error: '#ce5441',
+		warn: '#d0b868',
+		success: '#a1c758',
 	},
 }
--- a/packages/frontend/src/pages/clip.vue
+++ b/packages/frontend/src/pages/clip.vue
@ -150,7 +150,7 @@ const headerActions = computed(() => clip.value && isOwned.value ? [{
 			},
 		}, {
 			icon: 'ti ti-code',
-			text: i18n.ts.genEmbedCode,
+			text: i18n.ts.embed,
 			action: () => {
 				genEmbedCode('clips', clip.value!.id);
 			},
--- a/packages/frontend/src/pages/tag.vue
+++ b/packages/frontend/src/pages/tag.vue
@ -56,7 +56,7 @@ const headerActions = computed(() => [{
 	label: i18n.ts.more,
 	handler: (ev: MouseEvent) => {
 		os.popupMenu([{
-			text: i18n.ts.genEmbedCode,
+			text: i18n.ts.embed,
 			icon: 'ti ti-code',
 			action: () => {
 				genEmbedCode('tags', props.tag);
--- a/packages/frontend/src/utility/get-note-menu.ts
+++ b/packages/frontend/src/utility/get-note-menu.ts
@ -331,7 +331,7 @@ export function getNoteMenu(props: {
 				},
 			});
 		} else {
-			menuItems.push(getNoteEmbedCodeMenu(appearNote, i18n.ts.genEmbedCode));
+			menuItems.push(getNoteEmbedCodeMenu(appearNote, i18n.ts.embed));
 		}

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

--- a/packages/frontend/src/utility/get-user-menu.ts
+++ b/packages/frontend/src/utility/get-user-menu.ts
@ -198,7 +198,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
 	} else {
 		menuItems.push({
 			icon: 'ti ti-code',
-			text: i18n.ts.genEmbedCode,
+			text: i18n.ts.embed,
 			type: 'parent',
 			children: [{
 				text: i18n.ts.noteOfThisUser,
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