From 06f8d8f0a3fb62284e33859dd72f87ff599371ac Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Fri, 16 Nov 2018 17:24:03 +0900 Subject: [PATCH 1/2] Show server version on server.info.vue (#3264) --- src/client/app/common/views/widgets/server.info.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/app/common/views/widgets/server.info.vue b/src/client/app/common/views/widgets/server.info.vue index 3cb1748128..00bc83de9a 100644 --- a/src/client/app/common/views/widgets/server.info.vue +++ b/src/client/app/common/views/widgets/server.info.vue @@ -3,6 +3,7 @@

Maintainer: {{ meta.maintainer.name }}

Machine: {{ meta.machine }}

Node: {{ meta.node }}

+

Version: {{ meta.version }}

From 9d3a1cab6e6786fe281404be193c4c936b538a30 Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Fri, 16 Nov 2018 17:41:52 +0900 Subject: [PATCH 2/2] Fix #3224 (#3265) --- src/client/app/desktop/views/components/post-form.vue | 1 + src/client/app/desktop/views/widgets/post-form.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue index 02478b4eb3..2a3b9c1511 100644 --- a/src/client/app/desktop/views/components/post-form.vue +++ b/src/client/app/desktop/views/components/post-form.vue @@ -508,6 +508,7 @@ export default Vue.extend({ border solid 1px var(--primaryAlpha01) border-radius 4px transition border-color .2s ease + padding-right 30px &:hover border-color var(--primaryAlpha02) diff --git a/src/client/app/desktop/views/widgets/post-form.vue b/src/client/app/desktop/views/widgets/post-form.vue index 36cf30bbe7..5c8d25ac61 100644 --- a/src/client/app/desktop/views/widgets/post-form.vue +++ b/src/client/app/desktop/views/widgets/post-form.vue @@ -227,6 +227,7 @@ export default define({ background var(--desktopPostFormTextareaBg) border none border-bottom solid 1px var(--faceDivider) + padding-right 30px &:focus & + .emoji