profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

🎨

Browse source
This commit is contained in:
syuilo 2018-09-22 20:11:13 +09:00
parent aa5528d11e
commit 93e5e4afc0
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/client/app/desktop/views/components/ui.vue
View file

@ -1,7 +1,7 @@
<template> <template>
<div class="mk-ui" v-hotkey.global="keymap"> <div class="mk-ui" v-hotkey.global="keymap">
<div class="bg" v-if="$store.getters.isSignedIn && $store.state.i.wallpaperUrl" :style="style"></div> <div class="bg" v-if="$store.getters.isSignedIn && $store.state.i.wallpaperUrl" :style="style"></div>
<x-header class="header" v-show="!zenMode"/> <x-header class="header" v-show="!zenMode" ref="header"/>
<div class="content"> <div class="content">
<slot></slot> <slot></slot>
</div> </div>
@ -59,6 +59,9 @@ export default Vue.extend({
toggleZenMode() { toggleZenMode() {
this.zenMode = !this.zenMode; this.zenMode = !this.zenMode;
this.$nextTick(() => {
this.$store.commit('setUiHeaderHeight', this.$refs.header.$el.offsetHeight);
});
} }
} }
}); });

2
src/client/app/desktop/views/pages/deck/deck.column.vue
View file

@ -279,7 +279,7 @@ root(isDark)
height 100% height 100%
background isDark ? #282C37 : #fff background isDark ? #282C37 : #fff
border-radius 6px border-radius 6px
box-shadow 0 2px 16px rgba(#000, 0.1) //box-shadow 0 2px 16px rgba(#000, 0.1)
overflow hidden overflow hidden
&.draghover &.draghover

7
src/client/app/desktop/views/pages/deck/deck.vue
View file

@ -1,6 +1,6 @@
<template> <template>
<mk-ui :class="$style.root"> <mk-ui :class="$style.root">
<div class="qlvquzbjribqcaozciifydkngcwtyzje" :data-darkmode="$store.state.device.darkmode"> <div class="qlvquzbjribqcaozciifydkngcwtyzje" :data-darkmode="$store.state.device.darkmode" :style="style">
<template v-for="ids in layout"> <template v-for="ids in layout">
<div v-if="ids.length > 1" class="folder"> <div v-if="ids.length > 1" class="folder">
<template v-for="id, i in ids"> <template v-for="id, i in ids">
@ -35,6 +35,11 @@ export default Vue.extend({
if (this.$store.state.settings.deck == null) return []; if (this.$store.state.settings.deck == null) return [];
if (this.$store.state.settings.deck.layout == null) return this.$store.state.settings.deck.columns.map(c => [c.id]); if (this.$store.state.settings.deck.layout == null) return this.$store.state.settings.deck.columns.map(c => [c.id]);
return this.$store.state.settings.deck.layout; return this.$store.state.settings.deck.layout;
},
style(): any {
return {
height: `calc(100vh - ${this.$store.state.uiHeaderHeight}px)`
};
} }
}, },