Tune font (#5125)
This commit is contained in:
parent
933c83679e
commit
24e389bcf3
8 changed files with 9 additions and 38 deletions
|
@ -41,7 +41,6 @@ export default Vue.extend({
|
||||||
padding 10px
|
padding 10px
|
||||||
width 100%
|
width 100%
|
||||||
height 40px
|
height 40px
|
||||||
font-family sans-serif
|
|
||||||
font-size 16px
|
font-size 16px
|
||||||
color var(--googleSearchFg)
|
color var(--googleSearchFg)
|
||||||
background var(--googleSearchBg)
|
background var(--googleSearchBg)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<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">
|
<header v-if="showTitle">
|
||||||
<div class="title">{{ page.title }}</div>
|
<div class="title">{{ page.title }}</div>
|
||||||
</header>
|
</header>
|
||||||
|
@ -151,6 +151,10 @@ export default Vue.extend({
|
||||||
overflow hidden
|
overflow hidden
|
||||||
background var(--face)
|
background var(--face)
|
||||||
|
|
||||||
|
&.serif
|
||||||
|
> div
|
||||||
|
font-family serif
|
||||||
|
|
||||||
&.center
|
&.center
|
||||||
text-align center
|
text-align center
|
||||||
|
|
||||||
|
|
|
@ -10,10 +10,6 @@
|
||||||
<span class="separator" v-if="folder != null"><fa icon="angle-right"/></span>
|
<span class="separator" v-if="folder != null"><fa icon="angle-right"/></span>
|
||||||
<span class="folder current" v-if="folder != null">{{ folder.name }}</span>
|
<span class="folder current" v-if="folder != null">{{ folder.name }}</span>
|
||||||
</div>
|
</div>
|
||||||
<!--
|
|
||||||
TODO: #343
|
|
||||||
<input class="search" type="search" placeholder=" %i18n:@search%"/>
|
|
||||||
-->
|
|
||||||
</nav>
|
</nav>
|
||||||
<div class="main" :class="{ uploading: uploadings.length > 0, fetching }"
|
<div class="main" :class="{ uploading: uploadings.length > 0, fetching }"
|
||||||
ref="main"
|
ref="main"
|
||||||
|
@ -647,33 +643,6 @@ export default Vue.extend({
|
||||||
> [data-icon]
|
> [data-icon]
|
||||||
margin 0
|
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
|
> .main
|
||||||
padding 8px
|
padding 8px
|
||||||
height calc(100% - 38px)
|
height calc(100% - 38px)
|
||||||
|
|
|
@ -197,7 +197,6 @@ export default Vue.extend({
|
||||||
max-width 16em
|
max-width 16em
|
||||||
line-height 48px
|
line-height 48px
|
||||||
font-weight bold
|
font-weight bold
|
||||||
font-family Meiryo, sans-serif
|
|
||||||
text-decoration none
|
text-decoration none
|
||||||
|
|
||||||
@media (max-width 1100px)
|
@media (max-width 1100px)
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
html {
|
html {
|
||||||
font-family: sans-serif;
|
font-family: Roboto, HelveticaNeue, Arial, sans-serif;
|
||||||
}
|
}
|
||||||
|
|
||||||
body > noscript {
|
body > noscript {
|
||||||
|
|
|
@ -15,7 +15,7 @@ progress
|
||||||
box-shadow none
|
box-shadow none
|
||||||
|
|
||||||
textarea
|
textarea
|
||||||
font-family sans-serif
|
font-family Roboto, HelveticaNeue, Arial, sans-serif
|
||||||
|
|
||||||
button
|
button
|
||||||
margin 0
|
margin 0
|
||||||
|
|
|
@ -18,7 +18,7 @@ html, body
|
||||||
padding 0
|
padding 0
|
||||||
scroll-behavior smooth
|
scroll-behavior smooth
|
||||||
text-size-adjust 100%
|
text-size-adjust 100%
|
||||||
font-family sans-serif
|
font-family Roboto, HelveticaNeue, Arial, sans-serif
|
||||||
|
|
||||||
html.changing-theme
|
html.changing-theme
|
||||||
&, *
|
&, *
|
||||||
|
|
|
@ -8,7 +8,7 @@ html
|
||||||
title Misskey
|
title Misskey
|
||||||
style.
|
style.
|
||||||
html {
|
html {
|
||||||
font-family: sans-serif;
|
font-family: Roboto, HelveticaNeue, Arial, sans-serif;
|
||||||
}
|
}
|
||||||
|
|
||||||
main {
|
main {
|
||||||
|
|
Loading…
Reference in a new issue