diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2018-12-01 07:16:28 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2018-12-01 07:16:28 +0900 |
| commit | cf4cecd4dff5b67a979ba0b4b06645c3690f9e5c (patch) | |
| tree | 4fafa79fc605b87e9188d256d6e5e3545d922db9 | |
| parent | Exclude remote user or myself from talk user suggestions (#3449) (diff) | |
| download | sharkey-cf4cecd4dff5b67a979ba0b4b06645c3690f9e5c.tar.gz sharkey-cf4cecd4dff5b67a979ba0b4b06645c3690f9e5c.tar.bz2 sharkey-cf4cecd4dff5b67a979ba0b4b06645c3690f9e5c.zip | |
Fix media video (#3452)
* Fix: Always show nsfw
* [Client] Add missing video play icon
| -rw-r--r-- | src/client/app/desktop/views/components/media-video.vue | 2 | ||||
| -rw-r--r-- | src/client/app/init.ts | 2 | ||||
| -rw-r--r-- | src/client/app/mobile/views/components/media-video.vue | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/client/app/desktop/views/components/media-video.vue b/src/client/app/desktop/views/components/media-video.vue index 727af8ade2..4d73cfe3ab 100644 --- a/src/client/app/desktop/views/components/media-video.vue +++ b/src/client/app/desktop/views/components/media-video.vue @@ -1,5 +1,5 @@ <template> -<div class="uofhebxjdgksfmltszlxurtjnjjsvioh" v-if="video.isSensitive && hide" @click="hide = false"> +<div class="uofhebxjdgksfmltszlxurtjnjjsvioh" v-if="video.isSensitive && hide && !$store.state.device.alwaysShowNsfw" @click="hide = false"> <div> <b><fa icon="exclamation-triangle"/> {{ $t('sensitive') }}</b> <span>{{ $t('click-to-show') }}</span> diff --git a/src/client/app/init.ts b/src/client/app/init.ts index fef03e86f1..d8a2e05653 100644 --- a/src/client/app/init.ts +++ b/src/client/app/init.ts @@ -143,6 +143,7 @@ import { faCalendarAlt as farCalendarAlt, faHdd as farHdd, faMoon as farMoon, + faPlayCircle as farPlayCircle, } from '@fortawesome/free-regular-svg-icons'; import { @@ -268,6 +269,7 @@ library.add( farCalendarAlt, farHdd, farMoon, + farPlayCircle, fabTwitter, fabGithub, diff --git a/src/client/app/mobile/views/components/media-video.vue b/src/client/app/mobile/views/components/media-video.vue index 8cd9971b77..8c4e9e153a 100644 --- a/src/client/app/mobile/views/components/media-video.vue +++ b/src/client/app/mobile/views/components/media-video.vue @@ -1,5 +1,5 @@ <template> -<div class="icozogqfvdetwohsdglrbswgrejoxbdj" v-if="video.isSensitive && hide" @click="hide = false"> +<div class="icozogqfvdetwohsdglrbswgrejoxbdj" v-if="video.isSensitive && hide && !$store.state.device.alwaysShowNsfw" @click="hide = false"> <div> <b><fa icon="exclamation-triangle"/> {{ $t('sensitive') }}</b> <span>{{ $t('click-to-show') }}</span> |