From 7abd91f031d5a4ee7f3b7f9fdb4a851b56f98f02 Mon Sep 17 00:00:00 2001
From: fuyu <54523771+mfmfuyu@users.noreply.github.com>
Date: Sun, 9 Feb 2020 19:59:28 +0900
Subject: [PATCH] =?UTF-8?q?=E3=81=84=E3=81=8F=E3=81=A4=E3=81=8B=E3=81=AE?=
 =?UTF-8?q?=E3=82=B9=E3=82=BF=E3=82=A4=E3=83=AB=E3=82=92=E8=AA=BF=E6=95=B4?=
 =?UTF-8?q?=20(#5894)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Chrome(Android)で誕生日欄が崩れていたのを修正

* 入力欄のフォントを親要素から継承するように変更
---
 src/client/components/post-form.vue      | 4 ++--
 src/client/components/ui/input.vue       | 6 ++++--
 src/client/pages/messaging-room.form.vue | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/client/components/post-form.vue b/src/client/components/post-form.vue
index 166b3c7c5f..e089912e0c 100644
--- a/src/client/components/post-form.vue
+++ b/src/client/components/post-form.vue
@@ -153,7 +153,7 @@ export default Vue.extend({
 				this.$t('_postForm._placeholders.f')
 			];
 			const x = xs[Math.floor(Math.random() * xs.length)];
-			
+
 			return this.renote
 				? this.$t('_postForm.quotePlaceholder')
 				: this.reply
@@ -713,7 +713,7 @@ export default Vue.extend({
 			border-radius: 0;
 			background: transparent;
 			color: var(--fg);
-			font-family: initial;
+			font-family: inherit;
 
 			@media (max-width: 500px) {
 				padding: 0 16px;
diff --git a/src/client/components/ui/input.vue b/src/client/components/ui/input.vue
index 69d842ef0f..cd295b68d8 100644
--- a/src/client/components/ui/input.vue
+++ b/src/client/components/ui/input.vue
@@ -254,7 +254,7 @@ export default Vue.extend({
 
 	> .input {
 		position: relative;
-		
+
 		&:before {
 			content: '';
 			display: block;
@@ -327,14 +327,16 @@ export default Vue.extend({
 		}
 
 		> input {
+			$height: 32px;
 			display: block;
+			height: $height;
 			width: 100%;
 			margin: 0;
 			padding: 0;
 			font: inherit;
 			font-weight: normal;
 			font-size: 16px;
-			line-height: 32px;
+			line-height: $height;
 			color: var(--inputText);
 			background: transparent;
 			border: none;
diff --git a/src/client/pages/messaging-room.form.vue b/src/client/pages/messaging-room.form.vue
index 7dff9d6b2e..b32ecc467f 100644
--- a/src/client/pages/messaging-room.form.vue
+++ b/src/client/pages/messaging-room.form.vue
@@ -247,6 +247,7 @@ export default Vue.extend({
 		padding: 16px 16px 0 16px;
 		resize: none;
 		font-size: 1em;
+		font-family: inherit;
 		outline: none;
 		border: none;
 		border-radius: 0;