Merge branch 'develop'

This commit is contained in:
sim1222 2022-06-18 18:25:27 +09:00
commit 58fbe015be
5 changed files with 24 additions and 5 deletions

View File

@ -1,6 +1,6 @@
{
"name": "misskey",
"version": "12.111.1-simkey-v14",
"version": "12.111.1-simkey-v16",
"codename": "indigo",
"repository": {
"type": "git",

View File

@ -1,6 +1,7 @@
<template>
<form class="qlvuhzng _formRoot" autocomplete="new-password" @submit.prevent="onSubmit">
<template v-if="meta">
<div class="_formBlock">過去にこのインスタンスを訪れたことがある場合は<a href="/flush" target="_blank" class="_link">Local Storageを削除</a>してください</div>
<MkInput v-if="meta.disableRegistration" v-model="invitationCode" class="_formBlock" type="text" spellcheck="false" required>
<template #label>{{ $ts.invitationCode }}</template>
<template #prefix><i class="fas fa-key"></i></template>

View File

@ -4,12 +4,12 @@
author: 'sim1222',
base: 'light',
props: {
bg: 'rgba(250, 250, 250, 0.7)',
bg: 'rgba(250, 250, 250, 1)',
fg: '#444',
cwBg: '#b1b9c1',
cwFg: '#fff',
link: '#ff9400',
panel: 'rgba(255, 255, 255, 0.6)',
panel: 'rgba(255, 255, 255, 1)',
accent: '#81c08b',
header: ':alpha<0.7<@panel',
infoBg: '#e5f5ff',

View File

@ -18,7 +18,7 @@
</div>
</div>
<div class="main">
<div class="main" :class="{ 'noroot': $route.path === '/' }">
<div ref="contents" class="contents" :class="{ wallpaper }">
<header v-show="$route.path !== '/'" ref="header" class="header">
<XHeader :info="pageInfo"/>
@ -131,6 +131,16 @@ export default defineComponent({
</script>
<style lang="scss" scoped>
.noroot {
background: rgba(0, 0, 0, 0.6);
&.transparent {
-webkit-backdrop-filter: var(--blur, blur(12px));
backdrop-filter: var(--blur, blur(12px));
}
}
.mk-app {
min-height: 100vh;

View File

@ -6,7 +6,7 @@
<XKanban class="kanban" full/>
</div>
<div class="main">
<div class="main" :class="{ 'noroot': !root }">
<XKanban v-if="narrow && !root" class="banner" :powered-by="root"/>
<div class="contents">
@ -161,6 +161,14 @@ export default defineComponent({
</style>
<style lang="scss" scoped>
.noroot {
background: rgba(0, 0, 0, 0.6);
&.transparent {
-webkit-backdrop-filter: var(--blur, blur(12px));
backdrop-filter: var(--blur, blur(12px));
}
}
.tray-enter-active,
.tray-leave-active {
opacity: 1;