summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-05-31 16:44:11 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-05-31 16:44:11 +0900
commitd32d95918ca512db21baf88696d2afc73219eab3 (patch)
tree3f45db63bda914474f3864eb35e83be42aa9f6ba /src/client
parentFix (diff)
downloadmisskey-d32d95918ca512db21baf88696d2afc73219eab3.tar.gz
misskey-d32d95918ca512db21baf88696d2afc73219eab3.tar.bz2
misskey-d32d95918ca512db21baf88696d2afc73219eab3.zip
:art:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/desktop/views/components/home.vue14
-rw-r--r--src/client/app/desktop/views/components/ui.vue10
2 files changed, 18 insertions, 6 deletions
diff --git a/src/client/app/desktop/views/components/home.vue b/src/client/app/desktop/views/components/home.vue
index 9f6cf9614a..636ed871c7 100644
--- a/src/client/app/desktop/views/components/home.vue
+++ b/src/client/app/desktop/views/components/home.vue
@@ -63,9 +63,8 @@
<component v-for="widget in widgets[place]" :is="`mkw-${widget.name}`" :key="widget.id" :ref="widget.id" :widget="widget" @chosen="warp"/>
</div>
<div class="main">
- <mk-post-form v-if="$store.state.settings.showPostFormOnTopOfTl"/>
- <mk-timeline ref="tl" @loaded="onTlLoaded" v-if="mode == 'timeline'"/>
- <mk-mentions @loaded="onTlLoaded" v-if="mode == 'mentions'"/>
+ <mk-post-form class="form" v-if="$store.state.settings.showPostFormOnTopOfTl"/>
+ <mk-timeline class="tl" cref="tl" @loaded="onTlLoaded" v-if="mode == 'timeline'"/>
</div>
</template>
</div>
@@ -299,11 +298,18 @@ root(isDark)
width calc(100% - 275px * 2)
order 2
- .mk-post-form
+ > .form
margin-bottom 16px
border solid 1px rgba(#000, 0.075)
border-radius 4px
+ @media (max-width 700px)
+ padding 0
+
+ > .tl
+ border none
+ border-radius 0
+
> *:not(.main)
width 275px
padding 16px 0 16px 0
diff --git a/src/client/app/desktop/views/components/ui.vue b/src/client/app/desktop/views/components/ui.vue
index b6dd22c1f8..32cc71e4b0 100644
--- a/src/client/app/desktop/views/components/ui.vue
+++ b/src/client/app/desktop/views/components/ui.vue
@@ -1,6 +1,6 @@
<template>
-<div>
- <x-header/>
+<div class="mk-ui">
+ <x-header class="header"/>
<div class="content">
<slot></slot>
</div>
@@ -35,3 +35,9 @@ export default Vue.extend({
});
</script>
+<style lang="stylus" scoped>
+.mk-ui
+ > .header
+ @media (max-width 1000px)
+ display none
+</style>