Merge branch 'develop'
This commit is contained in:
commit
58fbe015be
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "misskey",
|
"name": "misskey",
|
||||||
"version": "12.111.1-simkey-v14",
|
"version": "12.111.1-simkey-v16",
|
||||||
"codename": "indigo",
|
"codename": "indigo",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<form class="qlvuhzng _formRoot" autocomplete="new-password" @submit.prevent="onSubmit">
|
<form class="qlvuhzng _formRoot" autocomplete="new-password" @submit.prevent="onSubmit">
|
||||||
<template v-if="meta">
|
<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>
|
<MkInput v-if="meta.disableRegistration" v-model="invitationCode" class="_formBlock" type="text" spellcheck="false" required>
|
||||||
<template #label>{{ $ts.invitationCode }}</template>
|
<template #label>{{ $ts.invitationCode }}</template>
|
||||||
<template #prefix><i class="fas fa-key"></i></template>
|
<template #prefix><i class="fas fa-key"></i></template>
|
||||||
|
@ -4,12 +4,12 @@
|
|||||||
author: 'sim1222',
|
author: 'sim1222',
|
||||||
base: 'light',
|
base: 'light',
|
||||||
props: {
|
props: {
|
||||||
bg: 'rgba(250, 250, 250, 0.7)',
|
bg: 'rgba(250, 250, 250, 1)',
|
||||||
fg: '#444',
|
fg: '#444',
|
||||||
cwBg: '#b1b9c1',
|
cwBg: '#b1b9c1',
|
||||||
cwFg: '#fff',
|
cwFg: '#fff',
|
||||||
link: '#ff9400',
|
link: '#ff9400',
|
||||||
panel: 'rgba(255, 255, 255, 0.6)',
|
panel: 'rgba(255, 255, 255, 1)',
|
||||||
accent: '#81c08b',
|
accent: '#81c08b',
|
||||||
header: ':alpha<0.7<@panel',
|
header: ':alpha<0.7<@panel',
|
||||||
infoBg: '#e5f5ff',
|
infoBg: '#e5f5ff',
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="main">
|
<div class="main" :class="{ 'noroot': $route.path === '/' }">
|
||||||
<div ref="contents" class="contents" :class="{ wallpaper }">
|
<div ref="contents" class="contents" :class="{ wallpaper }">
|
||||||
<header v-show="$route.path !== '/'" ref="header" class="header">
|
<header v-show="$route.path !== '/'" ref="header" class="header">
|
||||||
<XHeader :info="pageInfo"/>
|
<XHeader :info="pageInfo"/>
|
||||||
@ -131,6 +131,16 @@ export default defineComponent({
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<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 {
|
.mk-app {
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<XKanban class="kanban" full/>
|
<XKanban class="kanban" full/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="main">
|
<div class="main" :class="{ 'noroot': !root }">
|
||||||
<XKanban v-if="narrow && !root" class="banner" :powered-by="root"/>
|
<XKanban v-if="narrow && !root" class="banner" :powered-by="root"/>
|
||||||
|
|
||||||
<div class="contents">
|
<div class="contents">
|
||||||
@ -161,6 +161,14 @@ export default defineComponent({
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<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-enter-active,
|
||||||
.tray-leave-active {
|
.tray-leave-active {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user