diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-02-24 13:29:08 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-02-24 13:29:08 +0900 |
| commit | 1a6aae944ff9a77aab8d5132aa61aac70526731e (patch) | |
| tree | a37d670ff2d6eac6d350bf73081c468270a0686e /src | |
| parent | Merge branch 'develop' of https://github.com/syuilo/misskey into develop (diff) | |
| download | misskey-1a6aae944ff9a77aab8d5132aa61aac70526731e.tar.gz misskey-1a6aae944ff9a77aab8d5132aa61aac70526731e.tar.bz2 misskey-1a6aae944ff9a77aab8d5132aa61aac70526731e.zip | |
:art:
Diffstat (limited to '')
| -rw-r--r-- | src/client/app/desktop/views/components/ui.header.account.vue | 8 | ||||
| -rw-r--r-- | src/client/app/mobile/views/components/ui.nav.vue | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/client/app/desktop/views/components/ui.header.account.vue b/src/client/app/desktop/views/components/ui.header.account.vue index 7a6339f20d..78888c087a 100644 --- a/src/client/app/desktop/views/components/ui.header.account.vue +++ b/src/client/app/desktop/views/components/ui.header.account.vue @@ -68,9 +68,8 @@ </li> <li @click="dark"> <p> - <span>{{ $t('dark') }}</span> - <template v-if="$store.state.device.darkmode"><i><fa icon="moon"/></i></template> - <template v-else><i><fa :icon="['far', 'moon']"/></i></template> + <span>{{ $store.state.device.darkmode ? $t('@.turn-off-darkmode') : $t('@.turn-on-darkmode') }}</span> + <template><i><fa :icon="$store.state.device.darkmode ? faSun : faMoon"/></i></template> </p> </li> </ul> @@ -97,13 +96,14 @@ import MkSettingsWindow from './settings-window.vue'; import MkDriveWindow from './drive-window.vue'; import contains from '../../../common/scripts/contains'; import { faHome, faColumns } from '@fortawesome/free-solid-svg-icons'; +import { faMoon, faSun } from '@fortawesome/free-regular-svg-icons'; export default Vue.extend({ i18n: i18n('desktop/views/components/ui.header.account.vue'), data() { return { isOpen: false, - faHome, faColumns + faHome, faColumns, faMoon, faSun }; }, computed: { diff --git a/src/client/app/mobile/views/components/ui.nav.vue b/src/client/app/mobile/views/components/ui.nav.vue index ba27b87a50..26da9d668c 100644 --- a/src/client/app/mobile/views/components/ui.nav.vue +++ b/src/client/app/mobile/views/components/ui.nav.vue @@ -33,7 +33,7 @@ <li><a @click="search"><i><fa icon="search" fixed-width/></i>{{ $t('search') }}<i><fa icon="angle-right"/></i></a></li> <li><router-link to="/i/settings" :data-active="$route.name == 'settings'"><i><fa icon="cog" fixed-width/></i>{{ $t('settings') }}<i><fa icon="angle-right"/></i></router-link></li> <li v-if="$store.getters.isSignedIn && ($store.state.i.isAdmin || $store.state.i.isModerator)"><a href="/admin"><i><fa icon="terminal" fixed-width/></i><span>{{ $t('admin') }}</span><i><fa icon="angle-right"/></i></a></li> - <li @click="dark"><p><template v-if="$store.state.device.darkmode"><i><fa icon="moon" fixed-width/></i></template><template v-else><i><fa :icon="['far', 'moon']"/></i></template><span>{{ $t('darkmode') }}</span></p></li> + <li @click="dark"><p><template><i><fa :icon="$store.state.device.darkmode ? faSun : faMoon" fixed-width/></i></template><span>{{ $store.state.device.darkmode ? $t('@.turn-off-darkmode') : $t('@.turn-on-darkmode') }}</span></p></li> </ul> </div> <div class="announcements" v-if="announcements && announcements.length > 0"> @@ -53,6 +53,7 @@ import Vue from 'vue'; import i18n from '../../../i18n'; import { lang } from '../../../config'; import { faNewspaper, faHashtag } from '@fortawesome/free-solid-svg-icons'; +import { faMoon, faSun } from '@fortawesome/free-regular-svg-icons'; export default Vue.extend({ i18n: i18n('mobile/views/components/ui.nav.vue'), @@ -65,7 +66,7 @@ export default Vue.extend({ aboutUrl: `/docs/${lang}/about`, announcements: [], searching: false, - faNewspaper, faHashtag + faNewspaper, faHashtag, faMoon, faSun }; }, |