From 24e389bcf3768cb373683b614950077f92a2b72a Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Tue, 9 Jul 2019 17:01:08 +0900
Subject: [PATCH] Tune font (#5125)

---
 .../app/common/views/components/google.vue    |  1 -
 .../app/common/views/components/page/page.vue |  6 +++-
 .../app/desktop/views/components/drive.vue    | 31 -------------------
 .../views/components/ui.header.account.vue    |  1 -
 src/client/app/init.css                       |  2 +-
 src/client/app/reset.styl                     |  2 +-
 src/client/style.styl                         |  2 +-
 src/server/web/views/info.pug                 |  2 +-
 8 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/src/client/app/common/views/components/google.vue b/src/client/app/common/views/components/google.vue
index dab2e6824..1e8814739 100644
--- a/src/client/app/common/views/components/google.vue
+++ b/src/client/app/common/views/components/google.vue
@@ -41,7 +41,6 @@ export default Vue.extend({
 		padding 10px
 		width 100%
 		height 40px
-		font-family sans-serif
 		font-size 16px
 		color var(--googleSearchFg)
 		background var(--googleSearchBg)
diff --git a/src/client/app/common/views/components/page/page.vue b/src/client/app/common/views/components/page/page.vue
index 99e627fd8..1bfb93780 100644
--- a/src/client/app/common/views/components/page/page.vue
+++ b/src/client/app/common/views/components/page/page.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="iroscrza" :class="{ shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners, center: page.alignCenter }" :style="{ fontFamily: page.font }">
+<div class="iroscrza" :class="{ shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners, center: page.alignCenter, serif: page.font === 'serif' }">
 	<header v-if="showTitle">
 		<div class="title">{{ page.title }}</div>
 	</header>
@@ -150,6 +150,10 @@ export default Vue.extend({
 .iroscrza
 	overflow hidden
 	background var(--face)
+	
+	&.serif
+		> div
+			font-family serif
 
 	&.center
 		text-align center
diff --git a/src/client/app/desktop/views/components/drive.vue b/src/client/app/desktop/views/components/drive.vue
index 2eb958135..a78c0040c 100644
--- a/src/client/app/desktop/views/components/drive.vue
+++ b/src/client/app/desktop/views/components/drive.vue
@@ -10,10 +10,6 @@
 			<span class="separator" v-if="folder != null"><fa icon="angle-right"/></span>
 			<span class="folder current" v-if="folder != null">{{ folder.name }}</span>
 		</div>
-		<!--
-			TODO: #343
-			<input class="search" type="search" placeholder="&#xf002; %i18n:@search%"/>
-		-->
 	</nav>
 	<div class="main" :class="{ uploading: uploadings.length > 0, fetching }"
 		ref="main"
@@ -647,33 +643,6 @@ export default Vue.extend({
 					> [data-icon]
 						margin 0
 
-		> .search
-			display inline-block
-			vertical-align bottom
-			user-select text
-			cursor auto
-			margin 0
-			padding 0 18px
-			width 200px
-			font-size 1em
-			line-height 38px
-			background transparent
-			outline none
-			//border solid 1px #ddd
-			border none
-			border-radius 0
-			box-shadow none
-			transition color 0.5s ease, border 0.5s ease
-			font-family FontAwesome, sans-serif
-
-			&[data-active='true']
-				background #fff
-
-			&::-webkit-input-placeholder,
-			&:-ms-input-placeholder,
-			&:-moz-placeholder
-				color $ui-control-foreground-color
-
 	> .main
 		padding 8px
 		height calc(100% - 38px)
diff --git a/src/client/app/desktop/views/components/ui.header.account.vue b/src/client/app/desktop/views/components/ui.header.account.vue
index c00c6b9c6..5d7ed8c30 100644
--- a/src/client/app/desktop/views/components/ui.header.account.vue
+++ b/src/client/app/desktop/views/components/ui.header.account.vue
@@ -197,7 +197,6 @@ export default Vue.extend({
 			max-width 16em
 			line-height 48px
 			font-weight bold
-			font-family Meiryo, sans-serif
 			text-decoration none
 
 			@media (max-width 1100px)
diff --git a/src/client/app/init.css b/src/client/app/init.css
index cd86b654c..db5e23c56 100644
--- a/src/client/app/init.css
+++ b/src/client/app/init.css
@@ -5,7 +5,7 @@
  */
 
 html {
-	font-family: sans-serif;
+	font-family: Roboto, HelveticaNeue, Arial, sans-serif;
 }
 
 body > noscript {
diff --git a/src/client/app/reset.styl b/src/client/app/reset.styl
index 8128f1ed2..ce49afb16 100644
--- a/src/client/app/reset.styl
+++ b/src/client/app/reset.styl
@@ -15,7 +15,7 @@ progress
 	box-shadow none
 
 textarea
-	font-family sans-serif
+	font-family Roboto, HelveticaNeue, Arial, sans-serif
 
 button
 	margin 0
diff --git a/src/client/style.styl b/src/client/style.styl
index 968e66e75..9638ea530 100644
--- a/src/client/style.styl
+++ b/src/client/style.styl
@@ -18,7 +18,7 @@ html, body
 	padding 0
 	scroll-behavior smooth
 	text-size-adjust 100%
-	font-family sans-serif
+	font-family Roboto, HelveticaNeue, Arial, sans-serif
 
 html.changing-theme
 	&, *
diff --git a/src/server/web/views/info.pug b/src/server/web/views/info.pug
index fc71e5c19..992e652a6 100644
--- a/src/server/web/views/info.pug
+++ b/src/server/web/views/info.pug
@@ -8,7 +8,7 @@ html
 		title Misskey
 		style.
 			html {
-				font-family: sans-serif;
+				font-family: Roboto, HelveticaNeue, Arial, sans-serif;
 			}
 
 			main {