misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey/master' into feature/misskey-2024.07

Browse source
This commit is contained in:
dakkar 2024-08-02 12:25:58 +01:00
commit cfa9b852df
585 changed files with 23423 additions and 9623 deletions
Download patch file Download diff file Expand all files Collapse all files

36
packages/frontend/src/ui/_common_/common.ts
View file

@ -85,40 +85,42 @@ export function openInstanceMenu(ev: MouseEvent) {
icon: 'ti ti-help-circle',
to: '/contact',
}, (instance.impressumUrl) ? {
type: 'a',
text: i18n.ts.impressum,
icon: 'ti ti-file-invoice',
action: () => {
window.open(instance.impressumUrl, '_blank', 'noopener');
},
href: instance.impressumUrl,
target: '_blank',
} : undefined, (instance.tosUrl) ? {
type: 'a',
text: i18n.ts.termsOfService,
icon: 'ti ti-notebook',
action: () => {
window.open(instance.tosUrl, '_blank', 'noopener');
},
href: instance.tosUrl,
target: '_blank',
} : undefined, (instance.privacyPolicyUrl) ? {
type: 'a',
text: i18n.ts.privacyPolicy,
icon: 'ti ti-shield-lock',
action: () => {
window.open(instance.privacyPolicyUrl, '_blank', 'noopener');
},
href: instance.privacyPolicyUrl,
target: '_blank',
} : undefined, (instance.donationUrl) ? {
type: 'a',
text: i18n.ts.donation,
icon: 'ph-hand-coins ph-bold ph-lg',
action: () => {
window.open(instance.donationUrl, '_blank', 'noopener');
},
} : undefined, (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl && !instance.donationUrl) ? undefined : { type: 'divider' }, {
href: instance.donationUrl,
target: '_blank',
}: undefined, (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl && !instance.donationUrl) ? undefined : { type: 'divider' }, {
type: 'a',
text: i18n.ts.document,
icon: 'ti ti-bulb',
action: () => {
window.open('https://misskey-hub.net/docs/for-users/', '_blank', 'noopener');
},
href: 'https://misskey-hub.net/docs/for-users/',
target: '_blank',
}, ($i) ? {
text: i18n.ts._initialTutorial.launchTutorial,
icon: 'ti ti-presentation',
action: () => {
os.popup(defineAsyncComponent(() => import('@/components/MkTutorialDialog.vue')), {}, {}, 'closed');
const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkTutorialDialog.vue')), {}, {
closed: () => dispose(),
});
},
} : undefined, {
type: 'link',

2
packages/frontend/src/ui/_common_/common.vue
View file

@ -232,7 +232,7 @@ if ($i) {
right: 15px;
pointer-events: none;
&:before {
&::before {
content: "";
display: block;
width: 18px;

11
packages/frontend/src/ui/_common_/navbar-for-mobile.vue
View file

@ -74,8 +74,9 @@ function openAccountMenu(ev: MouseEvent) {
}
function more() {
os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {}, {
}, 'closed');
const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {}, {
closed: () => dispose(),
});
}
</script>
@ -138,7 +139,7 @@ function more() {
font-weight: bold;
text-align: left;
&:before {
&::before {
content: "";
display: block;
width: calc(100% - 38px);
@ -154,7 +155,7 @@ function more() {
}
&:hover, &.active {
&:before {
&::before {
background: var(--accentLighten);
}
}
@ -225,7 +226,7 @@ function more() {
}
&:hover, &.active {
&:before {
&::before {
content: "";
display: block;
width: calc(100% - 24px);

91
packages/frontend/src/ui/_common_/navbar.vue
View file

@ -99,10 +99,11 @@ function openAccountMenu(ev: MouseEvent) {
}
function more(ev: MouseEvent) {
os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
src: ev.currentTarget ?? ev.target,
}, {
}, 'closed');
closed: () => dispose(),
});
}
</script>
@ -165,6 +166,15 @@ function more(ev: MouseEvent) {
display: block;
text-align: center;
width: 100%;
&:focus-visible {
outline: none;
> .instanceIcon {
outline: 2px solid var(--focus);
outline-offset: 2px;
}
}
}
.instanceIcon {
@ -191,7 +201,7 @@ function more(ev: MouseEvent) {
font-weight: bold;
text-align: left;
&:before {
&::before {
content: "";
display: block;
width: calc(100% - 38px);
@ -206,8 +216,17 @@ function more(ev: MouseEvent) {
background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB));
}
&:focus-visible {
outline: none;
&::before {
outline: 2px solid var(--fgOnAccent);
outline-offset: -4px;
}
}
&:hover, &.active {
&:before {
&::before {
background: var(--accentLighten);
}
}
@ -233,6 +252,14 @@ function more(ev: MouseEvent) {
text-align: left;
box-sizing: border-box;
overflow: clip;
&:focus-visible {
outline: none;
> .avatar {
box-shadow: 0 0 0 4px var(--focus);
}
}
}
.avatar {
@ -281,10 +308,19 @@ function more(ev: MouseEvent) {
color: var(--navActive);
}
&:hover, &.active {
&:focus-visible {
outline: none;
&::before {
outline: 2px solid var(--focus);
outline-offset: -2px;
}
}
&:hover, &.active, &:focus {
color: var(--accent);
&:before {
&::before {
content: "";
display: block;
width: calc(100% - 34px);
@ -351,6 +387,15 @@ function more(ev: MouseEvent) {
display: block;
text-align: center;
width: 100%;
&:focus-visible {
outline: none;
> .instanceIcon {
outline: 2px solid var(--focus);
outline-offset: 2px;
}
}
}
.instanceIcon {
@ -375,7 +420,7 @@ function more(ev: MouseEvent) {
height: 52px;
text-align: center;
&:before {
&::before {
content: "";
display: block;
position: absolute;
@ -390,8 +435,17 @@ function more(ev: MouseEvent) {
background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB));
}
&:focus-visible {
outline: none;
&::before {
outline: 2px solid var(--fgOnAccent);
outline-offset: -4px;
}
}
&:hover, &.active {
&:before {
&::before {
background: var(--accentLighten);
}
}
@ -412,6 +466,14 @@ function more(ev: MouseEvent) {
padding: 20px 0;
width: 100%;
overflow: clip;
&:focus-visible {
outline: none;
> .avatar {
box-shadow: 0 0 0 4px var(--focus);
}
}
}
.avatar {
@ -441,11 +503,20 @@ function more(ev: MouseEvent) {
width: 100%;
text-align: center;
&:hover, &.active {
&:focus-visible {
outline: none;
&::before {
outline: 2px solid var(--focus);
outline-offset: -2px;
}
}
&:hover, &.active, &:focus {
text-decoration: none;
color: var(--accent);
&:before {
&::before {
content: "";
display: block;
height: 100%;