HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

🎨

Browse source
This commit is contained in:
syuilo 2018-10-31 18:07:00 +09:00
parent de569147a5
commit 22d5862afb
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
5 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/client/app/common/views/components/mute-and-block.vue
View file

@ -4,9 +4,7 @@
<section> <section>
<header>%i18n:@mute%</header> <header>%i18n:@mute%</header>
<ui-info v-if="!muteFetching && mute.length == 0"> <ui-info v-if="!muteFetching && mute.length == 0">%i18n:@no-muted-users%</ui-info>
<p>%i18n:@no-muted-users%</p>
</ui-info>
<div class="users" v-if="mute.length != 0"> <div class="users" v-if="mute.length != 0">
<div v-for="user in mute" :key="user.id"> <div v-for="user in mute" :key="user.id">
<p><b>{{ user | userName }}</b> @{{ user | acct }}</p> <p><b>{{ user | userName }}</b> @{{ user | acct }}</p>
@ -16,9 +14,7 @@
<section> <section>
<header>%i18n:@block%</header> <header>%i18n:@block%</header>
<ui-info v-if="!blockFetching && block.length == 0"> <ui-info v-if="!blockFetching && block.length == 0">%i18n:@no-blocked-users%</ui-info>
<p>%i18n:@no-blocked-users%</p>
</ui-info>
<div class="users" v-if="block.length != 0"> <div class="users" v-if="block.length != 0">
<div v-for="user in block" :key="user.id"> <div v-for="user in block" :key="user.id">
<p><b>{{ user | userName }}</b> @{{ user | acct }}</p> <p><b>{{ user | userName }}</b> @{{ user | acct }}</p>

16
src/client/app/common/views/components/ui/info.vue
View file

@ -1,6 +1,7 @@
<template> <template>
<div class="ymxyweixqwsxauxldgpvecjepnwxbylu" :class="{ warn }"> <div class="ymxyweixqwsxauxldgpvecjepnwxbylu" :class="{ warn }">
<i v-if="warn">%fa:exclamation-triangle%</i> <i v-if="warn">%fa:exclamation-triangle%</i>
<i v-else>%fa:info-circle%</i>
<slot></slot> <slot></slot>
</div> </div>
</template> </template>
@ -23,11 +24,20 @@ export default Vue.extend({
margin 16px 0 margin 16px 0
padding 16px padding 16px
font-size 90% font-size 90%
background var(--infoBg)
> i color var(--infoFg)
margin-right 4px
&.warn &.warn
background var(--infoWarnBg) background var(--infoWarnBg)
color var(--infoWarnFg) color var(--infoWarnFg)
&:first-child
margin-top 0
&:last-child
margin-bottom 0
> i
margin-right 4px
</style> </style>

4
src/client/app/desktop/views/components/settings.apps.vue
View file

@ -1,8 +1,6 @@
<template> <template>
<div class="root"> <div class="root">
<div class="none ui info" v-if="!fetching && apps.length == 0"> <ui-info v-if="!fetching && apps.length == 0">%i18n:@no-apps%</ui-info>
<p>%fa:info-circle%%i18n:@no-apps%</p>
</div>
<div class="apps" v-if="apps.length != 0"> <div class="apps" v-if="apps.length != 0">
<div v-for="app in apps"> <div v-for="app in apps">
<p><b>{{ app.name }}</b></p> <p><b>{{ app.name }}</b></p>

2
src/client/theme/dark.json5
View file

@ -131,6 +131,8 @@
remoteInfoBg: '#42321c', remoteInfoBg: '#42321c',
remoteInfoFg: '#ffbd3e', remoteInfoFg: '#ffbd3e',
infoBg: '#253142',
infoFg: '#fff',
infoWarnBg: '#42321c', infoWarnBg: '#42321c',
infoWarnFg: '#ffbd3e', infoWarnFg: '#ffbd3e',

2
src/client/theme/light.json5
View file

@ -131,6 +131,8 @@
remoteInfoBg: '#fff0db', remoteInfoBg: '#fff0db',
remoteInfoFg: '#573c08', remoteInfoFg: '#573c08',
infoBg: '#e5f5ff',
infoFg: '#72818a',
infoWarnBg: '#fff0db', infoWarnBg: '#fff0db',
infoWarnFg: '#573c08', infoWarnFg: '#573c08',