Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-original/develop' into develop

Browse source
This commit is contained in:
mattyatea 2024-01-27 23:51:55 +09:00
commit fea64e8d94
12 changed files with 129 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
packages/frontend/src/components/MkMediaAudio.vue
View file

@ -273,7 +273,7 @@ onDeactivated(() => {
.hidden {
width: 100%;
background: none;
background: #000;
border: none;
outline: none;
font: inherit;
@ -283,7 +283,6 @@ onDeactivated(() => {
display: flex;
align-items: center;
justify-content: center;
background: #000;
}
.hiddenTextWrapper {

4
packages/frontend/src/components/MkMediaVideo.vue
View file

@ -396,7 +396,7 @@ onDeactivated(() => {
.hidden {
width: 100%;
background: none;
background: #000;
border: none;
outline: none;
font: inherit;
@ -406,7 +406,6 @@ onDeactivated(() => {
display: flex;
align-items: center;
justify-content: center;
background: #000;
}
.hiddenTextWrapper {
@ -466,7 +465,6 @@ onDeactivated(() => {
grid-template-columns: auto auto 1fr auto auto;
align-items: center;
gap: 4px 8px;
pointer-events: none;
padding: 35px 10px 10px 10px;
background: linear-gradient(rgba(0, 0, 0, 0),rgba(0, 0, 0, .75));

9
packages/frontend/src/scripts/get-user-menu.ts
View file

@ -170,7 +170,14 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
action: () => {
copyToClipboard(`${user.host ?? host}/@${user.username}.atom`);
},
}, {
}, ...(user.host != null && user.url != null ? [{
icon: 'ti ti-external-link',
text: i18n.ts.showOnRemote,
action: () => {
if (user.url == null) return;
window.open(user.url, '_blank', 'noopener');
},
}] : []), {
icon: 'ti ti-share',
text: i18n.ts.copyProfileUrl,
action: () => {