diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 193c3c502..de5505e7d 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -250,6 +250,10 @@ common/views/components/connect-failed.troubleshooter.vue: flush: "キャッシュの削除" set-version: "バージョン指定" +common/views/components/media-banner.vue: + sensitive: "閲覧注意" + click-to-show: "クリックして表示" + common/views/components/messaging.vue: search-user: "ユーザーを探す" you: "あなた" @@ -583,15 +587,6 @@ desktop/views/components/media-video.vue: sensitive: "閲覧注意" click-to-show: "クリックして表示" -desktop/views/components/media-audio.vue: - sensitive: "閲覧注意" - click-to-show: "クリックして表示" - -desktop/views/components/media-download.vue: - sensitive: "閲覧注意" - click-to-show: "クリックして表示" - download: "ダウンロード" - desktop/views/components/follow-button.vue: following: "フォロー中" follow: "フォロー" diff --git a/src/client/app/common/views/components/index.ts b/src/client/app/common/views/components/index.ts index 4700b6269..43cde6c54 100644 --- a/src/client/app/common/views/components/index.ts +++ b/src/client/app/common/views/components/index.ts @@ -18,6 +18,7 @@ import reactionsViewer from './reactions-viewer.vue'; import time from './time.vue'; import timer from './timer.vue'; import mediaList from './media-list.vue'; +import mediaBanner from './media-banner.vue'; import uploader from './uploader.vue'; import specialMessage from './special-message.vue'; import streamIndicator from './stream-indicator.vue'; @@ -59,6 +60,7 @@ Vue.component('mk-reactions-viewer', reactionsViewer); Vue.component('mk-time', time); Vue.component('mk-timer', timer); Vue.component('mk-media-list', mediaList); +Vue.component('mk-media-banner', mediaBanner); Vue.component('mk-uploader', uploader); Vue.component('mk-special-message', specialMessage); Vue.component('mk-stream-indicator', streamIndicator); diff --git a/src/client/app/common/views/components/media-banner.vue b/src/client/app/common/views/components/media-banner.vue new file mode 100644 index 000000000..69cd57944 --- /dev/null +++ b/src/client/app/common/views/components/media-banner.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/src/client/app/common/views/components/media-list.vue b/src/client/app/common/views/components/media-list.vue index 0312c2dfd..e949c063a 100644 --- a/src/client/app/common/views/components/media-list.vue +++ b/src/client/app/common/views/components/media-list.vue @@ -1,12 +1,15 @@ @@ -32,62 +35,64 @@ export default Vue.extend({ diff --git a/src/client/app/desktop/views/components/index.ts b/src/client/app/desktop/views/components/index.ts index 159ead498..7b7a38afa 100644 --- a/src/client/app/desktop/views/components/index.ts +++ b/src/client/app/desktop/views/components/index.ts @@ -13,7 +13,6 @@ import ellipsisIcon from './ellipsis-icon.vue'; import mediaImage from './media-image.vue'; import mediaImageDialog from './media-image-dialog.vue'; import mediaVideo from './media-video.vue'; -import mediaAudio from './media-audio.vue'; import notifications from './notifications.vue'; import noteForm from './post-form.vue'; import renoteForm from './renote-form.vue'; @@ -44,7 +43,6 @@ Vue.component('mk-ellipsis-icon', ellipsisIcon); Vue.component('mk-media-image', mediaImage); Vue.component('mk-media-image-dialog', mediaImageDialog); Vue.component('mk-media-video', mediaVideo); -Vue.component('mk-media-audio', mediaAudio); Vue.component('mk-notifications', notifications); Vue.component('mk-post-form', noteForm); Vue.component('mk-renote-form', renoteForm); diff --git a/src/client/app/desktop/views/components/media-audio.vue b/src/client/app/desktop/views/components/media-audio.vue deleted file mode 100644 index 5d41947b1..000000000 --- a/src/client/app/desktop/views/components/media-audio.vue +++ /dev/null @@ -1,67 +0,0 @@ - - - - - diff --git a/src/client/app/desktop/views/components/media-download.vue b/src/client/app/desktop/views/components/media-download.vue deleted file mode 100644 index 236b06520..000000000 --- a/src/client/app/desktop/views/components/media-download.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - - diff --git a/src/client/app/desktop/views/components/media-image.vue b/src/client/app/desktop/views/components/media-image.vue index 0284872c6..904dc7f83 100644 --- a/src/client/app/desktop/views/components/media-image.vue +++ b/src/client/app/desktop/views/components/media-image.vue @@ -89,7 +89,7 @@ export default Vue.extend({ text-align center font-size 12px - > b + > * display block diff --git a/src/client/app/desktop/views/components/media-video.vue b/src/client/app/desktop/views/components/media-video.vue index 6c60f2da9..0a374acb8 100644 --- a/src/client/app/desktop/views/components/media-video.vue +++ b/src/client/app/desktop/views/components/media-video.vue @@ -6,19 +6,11 @@
-
@@ -34,9 +26,6 @@ export default Vue.extend({ type: Object, required: true }, - inlinePlayable: { - default: false - }, hide: { type: Boolean, default: true @@ -68,12 +57,6 @@ export default Vue.extend({ diff --git a/src/client/app/mobile/views/components/media-image.vue b/src/client/app/mobile/views/components/media-image.vue index e40069bbe..c8766f546 100644 --- a/src/client/app/mobile/views/components/media-image.vue +++ b/src/client/app/mobile/views/components/media-image.vue @@ -65,7 +65,7 @@ export default Vue.extend({ text-align center font-size 12px - > b + > * display block