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

Merge branch 'misskey-develop' into merge/2025-03-24

Browse source 
# Conflicts:
#	.github/workflows/api-misskey-js.yml
#	.github/workflows/changelog-check.yml
#	.github/workflows/check-misskey-js-autogen.yml
#	.github/workflows/get-api-diff.yml
#	.github/workflows/lint.yml
#	.github/workflows/locale.yml
#	.github/workflows/on-release-created.yml
#	.github/workflows/storybook.yml
#	.github/workflows/test-backend.yml
#	.github/workflows/test-federation.yml
#	.github/workflows/test-frontend.yml
#	.github/workflows/test-misskey-js.yml
#	.github/workflows/test-production.yml
#	.github/workflows/validate-api-json.yml
#	locales/index.d.ts
#	package.json
#	packages/misskey-js/generator/package.json
#	packages/misskey-js/package.json
#	pnpm-lock.yaml
#	scripts/changelog-checker/package-lock.json
#	scripts/changelog-checker/package.json
This commit is contained in:
Hazelnoot 2025-04-01 09:58:59 -04:00
commit 7ff15816d1
35 changed files with 716 additions and 379 deletions
Download patch file Download diff file Expand all files Collapse all files

24
packages/frontend/src/components/MkThemePreview.vue
View file

@ -12,11 +12,13 @@ SPDX-License-Identifier: AGPL-3.0-only
<path transform="scale(.26458)" d="m439.77 247.19c-43.673 0-78.832 35.157-78.832 78.83v249.98h407.06v-328.81z" :fill="themeVariables.panel"/>
</g>
<circle cx="32" cy="83" r="21" :fill="themeVariables.accentedBg"/>
<circle cx="136" cy="106" r="23" :fill="themeVariables.fg" fill-opacity="0.5"/>
<g :fill="themeVariables.fg" fill-rule="evenodd">
<rect x="171" y="88" width="48" height="6" ry="3"/>
<rect x="171" y="108" width="48" height="6" ry="3"/>
<rect x="171" y="128" width="48" height="6" ry="3"/>
<g>
<rect x="120" y="88" width="40" height="6" ry="3" :fill="themeVariables.fg"/>
<rect x="170" y="88" width="20" height="6" ry="3" :fill="themeVariables.mention"/>
<rect x="120" y="108" width="20" height="6" ry="3" :fill="themeVariables.hashtag"/>
<rect x="150" y="108" width="40" height="6" ry="3" :fill="themeVariables.fg"/>
<rect x="120" y="128" width="40" height="6" ry="3" :fill="themeVariables.fg"/>
<rect x="170" y="128" width="20" height="6" ry="3" :fill="themeVariables.link"/>
</g>
<path d="m65.498 40.892h137.7" :stroke="themeVariables.divider" stroke-width="0.75"/>
<g transform="matrix(.60823 0 0 .60823 25.45 75.755)" fill="none" :stroke="themeVariables.accent" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
@ -53,14 +55,23 @@ const themeVariables = ref<{
bg: string;
panel: string;
fg: string;
mention: string;
hashtag: string;
link: string;
divider: string;
accent: string;
accentedBg: string;
navBg: string;
success: string;
warn: string;
error: string;
}>({
bg: 'var(--MI_THEME-bg)',
panel: 'var(--MI_THEME-panel)',
fg: 'var(--MI_THEME-fg)',
mention: 'var(--MI_THEME-mention)',
hashtag: 'var(--MI_THEME-hashtag)',
link: 'var(--MI_THEME-link)',
divider: 'var(--MI_THEME-divider)',
accent: 'var(--MI_THEME-accent)',
accentedBg: 'var(--MI_THEME-accentedBg)',
@ -86,6 +97,9 @@ watch(() => props.theme, (theme) => {
bg: compiled.bg ?? 'var(--MI_THEME-bg)',
panel: compiled.panel ?? 'var(--MI_THEME-panel)',
fg: compiled.fg ?? 'var(--MI_THEME-fg)',
mention: compiled.mention ?? 'var(--MI_THEME-mention)',
hashtag: compiled.hashtag ?? 'var(--MI_THEME-hashtag)',
link: compiled.link ?? 'var(--MI_THEME-link)',
divider: compiled.divider ?? 'var(--MI_THEME-divider)',
accent: compiled.accent ?? 'var(--MI_THEME-accent)',
accentedBg: compiled.accentedBg ?? 'var(--MI_THEME-accentedBg)',

10
packages/frontend/src/components/global/PageWithAnimBg.vue
View file

@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template>
<div>
<MkAnimBg style="position: absolute;"/>
<div class="_pageScrollable" style="position: absolute; top: 0; width: 100%; height: 100%;">
<div class="_pageScrollable" :class="$style.body">
<slot></slot>
</div>
</div>
@ -17,5 +17,13 @@ import MkAnimBg from '@/components/MkAnimBg.vue';
</script>
<style lang="scss" module>
.body {
position: absolute;
top: 0;
width: 100%;
height: 100%;
// _pageScrollable はパフォーマンス上の理由で背景色が設定されているため
background: transparent !important;
}
</style>