From d0437ce5402cca1ed14634a4a6017561d3ecb4b4 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 22 Sep 2018 20:11:13 +0900
Subject: [PATCH] :art:
---
src/client/app/desktop/views/components/ui.vue | 5 ++++-
src/client/app/desktop/views/pages/deck/deck.column.vue | 2 +-
src/client/app/desktop/views/pages/deck/deck.vue | 7 ++++++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/client/app/desktop/views/components/ui.vue b/src/client/app/desktop/views/components/ui.vue
index 740eedf43..2d1e98447 100644
--- a/src/client/app/desktop/views/components/ui.vue
+++ b/src/client/app/desktop/views/components/ui.vue
@@ -1,7 +1,7 @@
<template>
<div class="mk-ui" v-hotkey.global="keymap">
<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">
<slot></slot>
</div>
@@ -59,6 +59,9 @@ export default Vue.extend({
toggleZenMode() {
this.zenMode = !this.zenMode;
+ this.$nextTick(() => {
+ this.$store.commit('setUiHeaderHeight', this.$refs.header.$el.offsetHeight);
+ });
}
}
});
diff --git a/src/client/app/desktop/views/pages/deck/deck.column.vue b/src/client/app/desktop/views/pages/deck/deck.column.vue
index abb09775f..04aa5e82d 100644
--- a/src/client/app/desktop/views/pages/deck/deck.column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.column.vue
@@ -279,7 +279,7 @@ root(isDark)
height 100%
background isDark ? #282C37 : #fff
border-radius 6px
- box-shadow 0 2px 16px rgba(#000, 0.1)
+ //box-shadow 0 2px 16px rgba(#000, 0.1)
overflow hidden
&.draghover
diff --git a/src/client/app/desktop/views/pages/deck/deck.vue b/src/client/app/desktop/views/pages/deck/deck.vue
index e5aeba251..810770a02 100644
--- a/src/client/app/desktop/views/pages/deck/deck.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.vue
@@ -1,6 +1,6 @@
<template>
<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">
<div v-if="ids.length > 1" class="folder">
<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.layout == null) return this.$store.state.settings.deck.columns.map(c => [c.id]);
return this.$store.state.settings.deck.layout;
+ },
+ style(): any {
+ return {
+ height: `calc(100vh - ${this.$store.state.uiHeaderHeight}px)`
+ };
}
},