summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-05-25 09:21:50 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-05-25 09:21:50 +0900
commit622266d20074caa58616e215b7bb4c5429157532 (patch)
treeac067cccc31da0e60a64e661ea3c80ac8415b8e1 /src/client
parent11.19.0 (diff)
parentNew Crowdin translations (#4955) (diff)
downloadmisskey-622266d20074caa58616e215b7bb4c5429157532.tar.gz
misskey-622266d20074caa58616e215b7bb4c5429157532.tar.bz2
misskey-622266d20074caa58616e215b7bb4c5429157532.zip
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/common/views/components/messaging-room.vue6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/client/app/common/views/components/messaging-room.vue b/src/client/app/common/views/components/messaging-room.vue
index 658dc93f64..d5fa4143a0 100644
--- a/src/client/app/common/views/components/messaging-room.vue
+++ b/src/client/app/common/views/components/messaging-room.vue
@@ -300,17 +300,13 @@ export default Vue.extend({
<style lang="stylus" scoped>
.mk-messaging-room
- display flex
- flex 1
- flex-direction column
- height 100%
background var(--messagingRoomBg)
> .body
width 100%
max-width 600px
margin 0 auto
- flex 1
+ min-height calc(100% - 103px)
> .init,
> .empty