diff options
| author | Amelia Yukii <amelia.yukii@shourai.de> | 2024-02-05 11:52:58 +0000 |
|---|---|---|
| committer | Amelia Yukii <amelia.yukii@shourai.de> | 2024-02-05 11:52:58 +0000 |
| commit | 1e97bf67dffa7cc09bcbbcc630496707f72a8672 (patch) | |
| tree | c85b4e1f64a7f57d912f58a2f27764d2f364c898 /packages/frontend/src/scripts | |
| parent | merge: fix: reply hover effect (!403) (diff) | |
| parent | upd: replace pencil icon, widget icon (diff) | |
| download | sharkey-1e97bf67dffa7cc09bcbbcc630496707f72a8672.tar.gz sharkey-1e97bf67dffa7cc09bcbbcc630496707f72a8672.tar.bz2 sharkey-1e97bf67dffa7cc09bcbbcc630496707f72a8672.zip | |
merge: upd: replace pencil icon, widget icon (!405)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/405
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
Diffstat (limited to 'packages/frontend/src/scripts')
4 files changed, 10 insertions, 10 deletions
diff --git a/packages/frontend/src/scripts/get-drive-file-menu.ts b/packages/frontend/src/scripts/get-drive-file-menu.ts index 44b5dc20e7..5060b7346a 100644 --- a/packages/frontend/src/scripts/get-drive-file-menu.ts +++ b/packages/frontend/src/scripts/get-drive-file-menu.ts @@ -104,7 +104,7 @@ export function getDriveFileMenu(file: Misskey.entities.DriveFile, folder?: Miss }), }] : [], { type: 'divider' }, { text: i18n.ts.createNoteFromTheFile, - icon: 'ph-pencil ph-bold ph-lg', + icon: 'ph-pencil-simple ph-bold ph-lg', action: () => os.post({ initialFiles: [file], }), diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts index b58755fe58..e9e0f89556 100644 --- a/packages/frontend/src/scripts/get-note-menu.ts +++ b/packages/frontend/src/scripts/get-note-menu.ts @@ -298,7 +298,7 @@ export function getNoteMenu(props: { text: i18n.ts.copyContent, action: copyContent, }, getCopyNoteLinkMenu(appearNote, i18n.ts.copyLink) - , (appearNote.url || appearNote.uri) ? + , (appearNote.url || appearNote.uri) ? getCopyNoteOriginLinkMenu(appearNote, 'Copy link (Origin)') : undefined, (appearNote.url || appearNote.uri) ? { @@ -418,16 +418,16 @@ export function getNoteMenu(props: { ...(appearNote.userId === $i.id || $i.isModerator || $i.isAdmin ? [ { type: 'divider' }, appearNote.userId === $i.id ? { - icon: 'ph-pencil ph-bold ph-lg', + icon: 'ph-pencil-simple ph-bold ph-lg', text: i18n.ts.edit, action: edit, } : undefined, { - icon: 'ph-pencil-line ph-bold ph-lg', + icon: 'ph-pencil-simple-line ph-bold ph-lg', text: i18n.ts.deleteAndEdit, danger: true, action: delEdit, - }, + }, { icon: 'ph-trash ph-bold ph-lg', text: i18n.ts.delete, @@ -447,7 +447,7 @@ export function getNoteMenu(props: { text: i18n.ts.copyContent, action: copyContent, }, getCopyNoteLinkMenu(appearNote, i18n.ts.copyLink) - , (appearNote.url || appearNote.uri) ? + , (appearNote.url || appearNote.uri) ? getCopyNoteOriginLinkMenu(appearNote, 'Copy link (Origin)') : undefined, (appearNote.url || appearNote.uri) ? { diff --git a/packages/frontend/src/scripts/get-note-versions-menu.ts b/packages/frontend/src/scripts/get-note-versions-menu.ts index e05e2e91be..84292f1277 100644 --- a/packages/frontend/src/scripts/get-note-versions-menu.ts +++ b/packages/frontend/src/scripts/get-note-versions-menu.ts @@ -40,9 +40,9 @@ export async function getNoteVersionsMenu(props: { const _time = edit.oldDate == null ? NaN : typeof edit.oldDate === 'number' ? edit.oldDate : (edit.oldDate instanceof Date ? edit.oldDate : new Date(edit.oldDate)).getTime(); - + menu.push({ - icon: 'ph-pencil ph-bold ph-lg', + icon: 'ph-pencil-simple ph-bold ph-lg', text: _time ? dateTimeFormat.format(_time) : dateTimeFormat.format(new Date(edit.updatedAt)), action: () => openVersion(edit), }); diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts index 0c7cf7e0e6..7ef2c28c1e 100644 --- a/packages/frontend/src/scripts/get-user-menu.ts +++ b/packages/frontend/src/scripts/get-user-menu.ts @@ -192,7 +192,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter os.post({ specified: user, initialText: `${canonical} ` }); }, }, { type: 'divider' }, { - icon: 'ph-pencil ph-bold ph-lg', + icon: 'ph-pencil-simple ph-bold ph-lg', text: i18n.ts.editMemo, action: () => { editMemo(); @@ -364,7 +364,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter if ($i && meId === user.id) { menu = menu.concat([{ type: 'divider' }, { - icon: 'ph-pencil ph-bold ph-lg', + icon: 'ph-pencil-simple ph-bold ph-lg', text: i18n.ts.editProfile, action: () => { router.push('/settings/profile'); |