1
0
forked from mirror/misskey

Resolve #3287, resolve #3107

Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
This commit is contained in:
Aya Morisawa 2018-12-27 20:45:23 +09:00
parent 2f901da58c
commit 1404539895
No known key found for this signature in database
GPG Key ID: 3E64865D70D579F2
4 changed files with 38 additions and 9 deletions

View File

@ -29,6 +29,7 @@ import MkReversi from './views/pages/games/reversi.vue';
import MkShare from './views/pages/share.vue'; import MkShare from './views/pages/share.vue';
import MkFollow from '../common/views/pages/follow.vue'; import MkFollow from '../common/views/pages/follow.vue';
import MkNotFound from '../common/views/pages/not-found.vue'; import MkNotFound from '../common/views/pages/not-found.vue';
import MkSettings from './views/pages/settings.vue';
import Ctx from './views/components/context-menu.vue'; import Ctx from './views/components/context-menu.vue';
import PostFormWindow from './views/components/post-form-window.vue'; import PostFormWindow from './views/components/post-form-window.vue';
@ -140,6 +141,7 @@ init(async (launch) => {
{ path: '/i/messaging/:user', component: MkMessagingRoom }, { path: '/i/messaging/:user', component: MkMessagingRoom },
{ path: '/i/drive', component: MkDrive }, { path: '/i/drive', component: MkDrive },
{ path: '/i/drive/folder/:folder', component: MkDrive }, { path: '/i/drive/folder/:folder', component: MkDrive },
{ path: '/i/settings', component: MkSettings },
{ path: '/selectdrive', component: MkSelectDrive }, { path: '/selectdrive', component: MkSelectDrive },
{ path: '/search', component: MkSearch }, { path: '/search', component: MkSearch },
{ path: '/tags/:tag', name: 'tag', component: MkTag }, { path: '/tags/:tag', name: 'tag', component: MkTag },

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="mk-settings"> <div class="mk-settings">
<div class="nav"> <div class="nav" :class="{ inWindow }">
<p :class="{ active: page == 'profile' }" @mousedown="page = 'profile'"><fa icon="user" fixed-width/>{{ $t('profile') }}</p> <p :class="{ active: page == 'profile' }" @mousedown="page = 'profile'"><fa icon="user" fixed-width/>{{ $t('profile') }}</p>
<p :class="{ active: page == 'theme' }" @mousedown="page = 'theme'"><fa icon="palette" fixed-width/>{{ $t('theme') }}</p> <p :class="{ active: page == 'theme' }" @mousedown="page = 'theme'"><fa icon="palette" fixed-width/>{{ $t('theme') }}</p>
<p :class="{ active: page == 'web' }" @mousedown="page = 'web'"><fa icon="desktop" fixed-width/>Web</p> <p :class="{ active: page == 'web' }" @mousedown="page = 'web'"><fa icon="desktop" fixed-width/>Web</p>
@ -313,6 +313,11 @@ export default Vue.extend({
initialPage: { initialPage: {
type: String, type: String,
required: false required: false
},
inWindow: {
type: Boolean,
required: false,
default: true
} }
}, },
data() { data() {
@ -598,9 +603,11 @@ export default Vue.extend({
height 100% height 100%
padding 16px 0 0 0 padding 16px 0 0 0
overflow auto overflow auto
box-shadow var(--shadowRight)
z-index 1 z-index 1
&.inWindow
box-shadow var(--shadowRight)
> p > p
display block display block
padding 10px 16px padding 10px 16px

View File

@ -51,12 +51,12 @@
<i><fa icon="angle-right"/></i> <i><fa icon="angle-right"/></i>
</router-link> </router-link>
</li> </li>
<li @click="settings"> <li>
<p> <router-link to="/i/settings">
<i><fa icon="cog"/></i> <i><fa icon="cog"/></i>
<span>{{ $t('settings') }}</span> <span>{{ $t('settings') }}</span>
<i><fa icon="angle-right"/></i> <i><fa icon="angle-right"/></i>
</p> </router-link>
</li> </li>
<li v-if="$store.state.i.isAdmin || $store.state.i.isModerator"> <li v-if="$store.state.i.isAdmin || $store.state.i.isModerator">
<a href="/admin"> <a href="/admin">
@ -153,10 +153,6 @@ export default Vue.extend({
this.close(); this.close();
this.$root.new(MkFollowRequestsWindow); this.$root.new(MkFollowRequestsWindow);
}, },
settings() {
this.close();
this.$root.new(MkSettingsWindow);
},
signout() { signout() {
this.$root.signout(); this.$root.signout();
}, },

View File

@ -0,0 +1,24 @@
<template>
<mk-ui>
<main>
<x-settings :in-window="false"/>
</main>
</mk-ui>
</template>
<script lang="ts">
import Vue from 'vue';
export default Vue.extend({
components: {
XSettings: () => import('../components/settings.vue').then(m => m.default)
},
});
</script>
<style lang="stylus" scoped>
main
margin 0 auto
max-width 900px
</style>