Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2019-02-15 14:29:59 +09:00
commit e8719ff6e6
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69

View File

@ -43,12 +43,16 @@
<span>{{ $t('posts') }}</span> <span>{{ $t('posts') }}</span>
</div> </div>
<div> <div>
<router-link :to="user | userPage('following')">
<b>{{ user.followingCount | number }}</b> <b>{{ user.followingCount | number }}</b>
<span>{{ $t('following') }}</span> <span>{{ $t('following') }}</span>
</router-link>
</div> </div>
<div> <div>
<router-link :to="user | userPage('followers')">
<b>{{ user.followersCount | number }}</b> <b>{{ user.followersCount | number }}</b>
<span>{{ $t('followers') }}</span> <span>{{ $t('followers') }}</span>
</router-link>
</div> </div>
</div> </div>
</div> </div>
@ -453,11 +457,14 @@ export default Vue.extend({
padding 8px 8px 0 8px padding 8px 8px 0 8px
text-align center text-align center
> b > a
color var(--text)
>>> b
display block display block
font-size 110% font-size 110%
> span >>> span
display block display block
font-size 80% font-size 80%
opacity 0.7 opacity 0.7