From 78b560d89aa4aadd2d81871bd1f93f3c714e6b8c Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 19 Aug 2018 03:56:44 +0900 Subject: [PATCH] #2324 --- locales/ja.yml | 4 ++ .../desktop/views/components/drive.file.vue | 45 +++++++++++++----- .../views/components/drive.file-detail.vue | 7 +++ .../mobile/views/components/drive.file.vue | 30 +++++------- src/client/assets/label-red.svg | Bin 0 -> 441 bytes 5 files changed, 56 insertions(+), 30 deletions(-) create mode 100644 src/client/assets/label-red.svg 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% +
@@ -198,6 +202,9 @@ export default Vue.extend({ > [data-fa] margin-right 2px + > .nsfw + color #bf4633 + > .menu padding 14px border-top solid 1px #dfdfdf diff --git a/src/client/app/mobile/views/components/drive.file.vue b/src/client/app/mobile/views/components/drive.file.vue index c337629cb..6dec4b9f4 100644 --- a/src/client/app/mobile/views/components/drive.file.vue +++ b/src/client/app/mobile/views/components/drive.file.vue @@ -14,13 +14,17 @@ li.tag(style={background: tag.color, color: contrast(tag.color)})= tag.name -->
-

{{ file.type }}

-

-

{{ file.datasize | bytes }}

-

-

+ {{ file.type }} + + {{ 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 0000000000000000000000000000000000000000..45996aa9ce5c00fbad1f5f456e8fb86590bc4de0 GIT binary patch literal 441 zcmZutU2DQH6n&oHf4IAQ)h4N}STPg)Kn7zI<~H_N+t>!Xq_nZse{Z7O*n<$bH@WAW zoO37B<97j#sA{PdN9Iukp%R@+m2o_nU4Mkr$8KkGzj&Q*zSc{qn+(?Pv*)KdV4slB z!JLrAW&v*>D_|ZYWch-CxiRIKkhX2TcHrqMBdaPdbD7k{0*M1!60u^8d8tX!{o$nl zSz!p)oT~W^HJ?)I*guf*v5;zi3&^4lt$YfCT^m literal 0 HcmV?d00001