summaryrefslogtreecommitdiff
path: root/src/client/app/common/views
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-07-09 17:01:08 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-07-09 17:01:08 +0900
commit24e389bcf3768cb373683b614950077f92a2b72a (patch)
treed83c73ddf433fa9f823c4508e50d91fdf3babde4 /src/client/app/common/views
parentMerge branch 'develop' of https://github.com/syuilo/misskey into develop (diff)
downloadmisskey-24e389bcf3768cb373683b614950077f92a2b72a.tar.gz
misskey-24e389bcf3768cb373683b614950077f92a2b72a.tar.bz2
misskey-24e389bcf3768cb373683b614950077f92a2b72a.zip
Tune font (#5125)
Diffstat (limited to 'src/client/app/common/views')
-rw-r--r--src/client/app/common/views/components/google.vue1
-rw-r--r--src/client/app/common/views/components/page/page.vue6
2 files changed, 5 insertions, 2 deletions
diff --git a/src/client/app/common/views/components/google.vue b/src/client/app/common/views/components/google.vue
index dab2e6824a..1e88147399 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 99e627fd89..1bfb93780f 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