diff --git a/locales/ja.yml b/locales/ja.yml index a467c4ba6..42d4df54a 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -443,6 +443,7 @@ desktop/views/components/drive-window.vue: desktop/views/components/drive.file.vue: avatar: "アイコン" banner: "バナー" + nsfw: "閲覧注意" contextmenu: rename: "名前を変更" mark-as-sensitive: "閲覧注意に設定" @@ -954,12 +955,15 @@ mobile/views/components/drive-file-chooser.vue: select-file: "ファイルを選択" mobile/views/components/drive-folder-chooser.vue: select-folder: "フォルダーを選択" +mobile/views/components/drive.file.vue: + nsfw: "閲覧注意" mobile/views/components/drive.file-detail.vue: download: "ダウンロード" rename: "名前を変更" move: "移動" hash: "ハッシュ (md5)" exif: "EXIF" + nsfw: "閲覧注意" mobile/views/components/media-image.vue: sensitive: "閲覧注意" click-to-show: "クリックして表示" diff --git a/src/client/app/desktop/views/components/drive.file.vue b/src/client/app/desktop/views/components/drive.file.vue index 3b5be19dc..3ac8923c5 100644 --- a/src/client/app/desktop/views/components/drive.file.vue +++ b/src/client/app/desktop/views/components/drive.file.vue @@ -9,12 +9,18 @@ @contextmenu.prevent.stop="onContextmenu" :title="title" > -
+
+

%i18n:@avatar%

-
+
+

%i18n:@banner%

+
+ +

%i18n:@nsfw%

+
@@ -212,6 +218,11 @@ root(isDark) &:after background #0b65a5 + &.red + &:before + &:after + background #c12113 + &:active background rgba(#000, 0.1) @@ -220,6 +231,11 @@ root(isDark) &:after background #0b588c + &.red + &:before + &:after + background #ce2212 + &[data-is-selected] background $theme-color @@ -256,26 +272,29 @@ root(isDark) pointer-events none &:before - content "" - display block - position absolute - z-index 1 - top 0 - left 57px - width 28px - height 8px - background #0c7ac9 - &:after content "" display block position absolute z-index 1 + background #0c7ac9 + + &:before + top 0 + left 57px + width 28px + height 8px + + &:after top 57px left 0 width 8px height 28px - background #0c7ac9 + + &.red + &:before + &:after + background #c12113 > img position absolute diff --git a/src/client/app/mobile/views/components/drive.file-detail.vue b/src/client/app/mobile/views/components/drive.file-detail.vue index f6a22f95f..deb9941be 100644 --- a/src/client/app/mobile/views/components/drive.file-detail.vue +++ b/src/client/app/mobile/views/components/drive.file-detail.vue @@ -30,6 +30,10 @@ {{ file.datasize | bytes }} %fa:R clock% +
@@ -133,35 +137,27 @@ export default Vue.extend({ font-size 0.7em > .separator - display inline - margin 0 padding 0 4px color #CDCDCD > .type - display inline - margin 0 - padding 0 color #9D9D9D > .mk-file-type-icon margin-right 4px > .data-size - display inline - margin 0 - padding 0 color #9D9D9D > .created-at - display inline - margin 0 - padding 0 color #BDBDBD > [data-fa] margin-right 2px + > .nsfw + color #bf4633 + &[data-is-selected] background $theme-color diff --git a/src/client/assets/label-red.svg b/src/client/assets/label-red.svg new file mode 100644 index 000000000..9e6d8b720 --- /dev/null +++ b/src/client/assets/label-red.svg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2daf11a0a6b13131b40661a29a3dc25534ca7dd73062b52742bf6cdcad36a7c +size 441