diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-09 17:03:38 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-09 17:03:38 +0900 |
| commit | 41d041f70197107ac0711fc04c737eb4542cca1c (patch) | |
| tree | ad37bf153ecfe299f8e558046c1c928a5ac84404 /src/client/app/common | |
| parent | Merge branch 'develop' (diff) | |
| parent | 11.25.1 (diff) | |
| download | misskey-41d041f70197107ac0711fc04c737eb4542cca1c.tar.gz misskey-41d041f70197107ac0711fc04c737eb4542cca1c.tar.bz2 misskey-41d041f70197107ac0711fc04c737eb4542cca1c.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/client/app/common')
| -rw-r--r-- | src/client/app/common/views/components/google.vue | 1 | ||||
| -rw-r--r-- | src/client/app/common/views/components/page/page.vue | 6 |
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 |