merge: develop

This commit is contained in:
Mar0xy 2023-11-04 21:52:12 +01:00
commit db29a5c2da
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
134 changed files with 282 additions and 282 deletions

View file

@ -81,7 +81,7 @@ export function getDriveFileMenu(file: Misskey.entities.DriveFile, folder?: Miss
type: 'link',
to: `/my/drive/file/${file.id}`,
text: i18n.ts._fileViewer.title,
icon: 'ph-file-text ph-bold pg-lg',
icon: 'ph-file-text ph-bold ph-lg',
}, null, {
text: i18n.ts.rename,
icon: 'ph-textbox ph-bold ph-lg',

View file

@ -306,7 +306,7 @@ export function getNoteMenu(props: {
},
} : undefined,
{
icon: 'ph-share-network ph-bold pg-lg',
icon: 'ph-share-network ph-bold ph-lg',
text: i18n.ts.share,
action: share,
},
@ -317,11 +317,11 @@ export function getNoteMenu(props: {
} : undefined,
null,
statePromise.then(state => state.isFavorited ? {
icon: 'ph-star-half ph-bold pg-lg',
icon: 'ph-star-half ph-bold ph-lg',
text: i18n.ts.unfavorite,
action: () => toggleFavorite(false),
} : {
icon: 'ph-star ph-bold pg-lg',
icon: 'ph-star ph-bold ph-lg',
text: i18n.ts.favorite,
action: () => toggleFavorite(true),
}),
@ -384,7 +384,7 @@ export function getNoteMenu(props: {
action: edit,
} : undefined,
{
icon: 'ph-pencil-line ph-bold pg-lg',
icon: 'ph-pencil-line ph-bold ph-lg',
text: i18n.ts.deleteAndEdit,
danger: true,
action: delEdit,

View file

@ -170,7 +170,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
copyToClipboard(`${user.host ?? host}/@${user.username}.atom`);
},
}, {
icon: 'ph-share-network ph-bold pg-lg',
icon: 'ph-share-network ph-bold ph-lg',
text: i18n.ts.copyProfileUrl,
action: () => {
const canonical = user.host === null ? `@${user.username}` : `@${user.username}@${toUnicode(user.host)}`;
@ -191,7 +191,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
},
}, {
type: 'parent',
icon: 'ph-list ph-bold pg-lg',
icon: 'ph-list ph-bold ph-lg',
text: i18n.ts.addToList,
children: async () => {
const lists = await userListsCache.fetch();
@ -224,7 +224,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
},
}, {
type: 'parent',
icon: 'ph-flying-saucer ph-bold pg-lg',
icon: 'ph-flying-saucer ph-bold ph-lg',
text: i18n.ts.addToAntenna,
children: async () => {
const antennas = await antennasCache.fetch();
@ -255,7 +255,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
if (iAmModerator) {
menu = menu.concat([{
type: 'parent',
icon: 'ph-seal-check ph-bold pg-lg',
icon: 'ph-seal-check ph-bold ph-lg',
text: i18n.ts.roles,
children: async () => {
const roles = await rolesCache.fetch();
@ -297,11 +297,11 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
// フォローしたとしても user.isFollowing はリアルタイム更新されないので不便なため
//if (user.isFollowing) {
menu = menu.concat([{
icon: user.withReplies ? 'ph-envelope-open ph-bold pg-lg' : 'ph-envelope ph-bold pg-lg-off',
icon: user.withReplies ? 'ph-envelope-open ph-bold ph-lg' : 'ph-envelope ph-bold ph-lg-off',
text: user.withReplies ? i18n.ts.hideRepliesToOthersInTimeline : i18n.ts.showRepliesToOthersInTimeline,
action: toggleWithReplies,
}, {
icon: user.notify === 'none' ? 'ph-bell ph-bold pg-lg' : 'ph-bell ph-bold pg-lg-off',
icon: user.notify === 'none' ? 'ph-bell ph-bold ph-lg' : 'ph-bell ph-bold ph-lg-off',
text: user.notify === 'none' ? i18n.ts.notifyNotes : i18n.ts.unnotifyNotes,
action: toggleNotify,
}]);