This commit is contained in:
syuilo 2021-10-24 20:16:55 +09:00
parent c3fcfad910
commit dfd92efa89
7 changed files with 59 additions and 48 deletions

View file

@ -795,7 +795,7 @@ itsOff: "オフになっています"
emailRequiredForSignup: "アカウント登録にメールアドレスを必須にする" emailRequiredForSignup: "アカウント登録にメールアドレスを必須にする"
unread: "未読" unread: "未読"
filter: "フィルタ" filter: "フィルタ"
controllPanel: "コントロールパネル" controlPanel: "コントロールパネル"
manageAccounts: "アカウントを管理" manageAccounts: "アカウントを管理"
makeReactionsPublic: "リアクション一覧を公開する" makeReactionsPublic: "リアクション一覧を公開する"
makeReactionsPublicDescription: "あなたがしたリアクション一覧を誰でも見れるようにします。" makeReactionsPublicDescription: "あなたがしたリアクション一覧を誰でも見れるようにします。"

View file

@ -50,9 +50,6 @@ export default defineComponent({
border-top: solid 0.5px var(--divider); border-top: solid 0.5px var(--divider);
} }
margin-left: 16px;
margin-right: 16px;
> .title { > .title {
font-size: 0.9em; font-size: 0.9em;
opacity: 0.7; opacity: 0.7;
@ -120,7 +117,7 @@ export default defineComponent({
> .items { > .items {
display: grid; display: grid;
grid-template-columns: repeat(auto-fill, minmax(120px, 1fr)); grid-template-columns: repeat(auto-fill, minmax(130px, 1fr));
grid-gap: 8px; grid-gap: 8px;
padding: 0 16px; padding: 0 16px;

View file

@ -3,7 +3,9 @@
<div class="nav" v-if="!narrow || page == null"> <div class="nav" v-if="!narrow || page == null">
<MkHeader :info="header"></MkHeader> <MkHeader :info="header"></MkHeader>
<MkSpacer :content-max="700">
<div class="lxpfedzu"> <div class="lxpfedzu">
<div class="banner">
<img :src="$instance.iconUrl || '/favicon.ico'" alt="" class="icon"/> <img :src="$instance.iconUrl || '/favicon.ico'" alt="" class="icon"/>
</div> </div>
@ -12,6 +14,8 @@
<MkSuperMenu :def="menuDef" :grid="page == null"></MkSuperMenu> <MkSuperMenu :def="menuDef" :grid="page == null"></MkSuperMenu>
</div> </div>
</MkSpacer>
</div>
<div class="main"> <div class="main">
<MkStickyContainer> <MkStickyContainer>
<template #header><MkHeader v-if="childInfo && !childInfo.hideHeader" :info="childInfo"/></template> <template #header><MkHeader v-if="childInfo && !childInfo.hideHeader" :info="childInfo"/></template>
@ -315,7 +319,7 @@ export default defineComponent({
[symbols.PAGE_INFO]: INFO, [symbols.PAGE_INFO]: INFO,
menuDef, menuDef,
header: { header: {
title: i18n.locale.controllPanel, title: i18n.locale.controlPanel,
}, },
noMaintainerInformation, noMaintainerInformation,
noBotProtection, noBotProtection,
@ -357,13 +361,12 @@ export default defineComponent({
} }
> .nav { > .nav {
.lxpfedzu {
> .info { > .info {
margin: 16px; margin: 16px 0;
} }
}
}
.lxpfedzu { > .banner {
margin: 16px; margin: 16px;
> .icon { > .icon {
@ -372,5 +375,8 @@ export default defineComponent({
height: 42px; height: 42px;
border-radius: 8px; border-radius: 8px;
} }
}
}
}
} }
</style> </style>

View file

@ -1,10 +1,14 @@
<template> <template>
<div class="vvcocwet" :class="{ wide: !narrow }" ref="el"> <div class="vvcocwet" :class="{ wide: !narrow }" ref="el">
<div class="nav" v-if="!narrow || page == null"> <div class="nav" v-if="!narrow || page == null">
<MkSpacer :content-max="700">
<div class="baaadecd">
<div class="title">{{ $ts.settings }}</div> <div class="title">{{ $ts.settings }}</div>
<MkInfo v-if="emailNotConfigured" warn class="info">{{ $ts.emailNotConfiguredWarning }} <MkA to="/settings/email" class="_link">{{ $ts.configure }}</MkA></MkInfo> <MkInfo v-if="emailNotConfigured" warn class="info">{{ $ts.emailNotConfiguredWarning }} <MkA to="/settings/email" class="_link">{{ $ts.configure }}</MkA></MkInfo>
<MkSuperMenu :def="menuDef" :grid="page == null"></MkSuperMenu> <MkSuperMenu :def="menuDef" :grid="page == null"></MkSuperMenu>
</div> </div>
</MkSpacer>
</div>
<div class="main"> <div class="main">
<component :is="component" :key="page" v-bind="pageProps"/> <component :is="component" :key="page" v-bind="pageProps"/>
</div> </div>
@ -272,6 +276,7 @@ export default defineComponent({
<style lang="scss" scoped> <style lang="scss" scoped>
.vvcocwet { .vvcocwet {
> .nav { > .nav {
.baaadecd {
> .title { > .title {
margin: 16px; margin: 16px;
font-size: 1.5em; font-size: 1.5em;
@ -291,6 +296,7 @@ export default defineComponent({
} }
} }
} }
}
&.wide { &.wide {
display: flex; display: flex;
@ -303,8 +309,10 @@ export default defineComponent({
box-sizing: border-box; box-sizing: border-box;
overflow: auto; overflow: auto;
.baaadecd {
> .title { > .title {
margin: 24px; margin: 24px 0;
}
} }
} }

View file

@ -26,7 +26,7 @@
</template> </template>
<div class="divider"></div> <div class="divider"></div>
<MkA v-if="$i.isAdmin || $i.isModerator" class="item" active-class="active" to="/admin" v-click-anime> <MkA v-if="$i.isAdmin || $i.isModerator" class="item" active-class="active" to="/admin" v-click-anime>
<i class="fas fa-server fa-fw"></i><span class="text">{{ $ts.instance }}</span> <i class="fas fa-door-open fa-fw"></i><span class="text">{{ $ts.controlPanel }}</span>
</MkA> </MkA>
<button class="item _button" @click="more" v-click-anime> <button class="item _button" @click="more" v-click-anime>
<i class="fa fa-ellipsis-h fa-fw"></i><span class="text">{{ $ts.more }}</span> <i class="fa fa-ellipsis-h fa-fw"></i><span class="text">{{ $ts.more }}</span>

View file

@ -13,8 +13,8 @@
</component> </component>
</template> </template>
<div class="divider"></div> <div class="divider"></div>
<MkA v-if="$i.isAdmin || $i.isModerator" class="item" active-class="active" to="/admin" :behavior="settingsWindowed ? 'modalWindow' : null" v-click-anime v-tooltip="$ts.instance"> <MkA v-if="$i.isAdmin || $i.isModerator" class="item" active-class="active" to="/admin" :behavior="settingsWindowed ? 'modalWindow' : null" v-click-anime v-tooltip="$ts.controlPanel">
<i class="fas fa-server fa-fw"></i> <i class="fas fa-door-open fa-fw"></i>
</MkA> </MkA>
<button class="item _button" @click="more" v-click-anime> <button class="item _button" @click="more" v-click-anime>
<i class="fas fa-ellipsis-h fa-fw"></i> <i class="fas fa-ellipsis-h fa-fw"></i>

View file

@ -21,7 +21,7 @@
</template> </template>
<div class="divider"></div> <div class="divider"></div>
<MkA v-if="$i.isAdmin || $i.isModerator" class="item" active-class="active" to="/admin" :behavior="settingsWindowed ? 'modalWindow' : null" v-click-anime> <MkA v-if="$i.isAdmin || $i.isModerator" class="item" active-class="active" to="/admin" :behavior="settingsWindowed ? 'modalWindow' : null" v-click-anime>
<i class="fas fa-server fa-fw"></i><span class="text">{{ $ts.instance }}</span> <i class="fas fa-door-open fa-fw"></i><span class="text">{{ $ts.controlPanel }}</span>
</MkA> </MkA>
<button class="item _button" @click="more" v-click-anime> <button class="item _button" @click="more" v-click-anime>
<i class="fas fa-ellipsis-h fa-fw"></i><span class="text">{{ $ts.more }}</span> <i class="fas fa-ellipsis-h fa-fw"></i><span class="text">{{ $ts.more }}</span>