From 254cfaea284d12f188e28f56a0cec863e3177a49 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 25 Oct 2020 01:21:41 +0900 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=89=8D=E3=83=AB=E3=83=BC=E3=83=86?= =?UTF-8?q?=E3=82=A3=E3=83=B3=E3=82=B0=20(#6759)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip --- locales/ja-JP.yml | 3 + src/client/components/avatar.vue | 4 +- src/client/components/channel-preview.vue | 4 +- src/client/components/index.ts | 4 +- src/client/components/link.vue | 2 +- src/client/components/mention.vue | 4 +- src/client/components/mfm.ts | 4 +- src/client/components/note-header.vue | 8 +- src/client/components/note.vue | 19 +-- src/client/components/notification.vue | 26 +-- src/client/components/page-preview.vue | 4 +- src/client/components/page-window.vue | 80 +++++++-- src/client/components/sidebar.vue | 10 +- src/client/components/sub-note-content.vue | 4 +- src/client/components/ui/a.vue | 104 ++++++++++++ src/client/components/ui/context-menu.vue | 2 +- src/client/components/ui/menu.vue | 4 +- src/client/components/ui/radio.vue | 2 +- src/client/components/ui/window.vue | 27 ++- src/client/components/url-preview.vue | 2 +- src/client/components/url.vue | 2 +- src/client/components/user-info.vue | 2 +- src/client/components/user-preview.vue | 2 +- src/client/components/users-dialog.vue | 4 +- src/client/init.ts | 12 +- src/client/os.ts | 4 +- src/client/pages/docs.vue | 2 +- src/client/pages/explore.vue | 4 +- src/client/pages/follow-requests.vue | 2 +- src/client/pages/messaging/index.vue | 17 +- src/client/pages/messaging/messaging-room.vue | 2 +- src/client/pages/my-groups/index.vue | 2 +- src/client/pages/my-lists/index.vue | 2 +- src/client/pages/note.vue | 10 +- src/client/pages/page-editor/page-editor.vue | 2 +- src/client/pages/page.vue | 4 +- src/client/pages/settings/general.vue | 18 ++ src/client/pages/settings/index.vue | 73 +++++--- src/client/pages/settings/mute-block.vue | 8 +- src/client/pages/settings/theme.vue | 2 +- src/client/pages/tag.vue | 13 +- src/client/pages/test.vue | 2 +- src/client/pages/timeline.tutorial.vue | 8 +- src/client/pages/user/follow-list.vue | 11 +- src/client/pages/user/index.photos.vue | 4 +- src/client/pages/user/index.vue | 40 +++-- src/client/router.ts | 39 ++--- src/client/scripts/get-user-menu.ts | 3 +- src/client/sidebar.ts | 4 +- src/client/store.ts | 2 + .../{root.vue => ui/_common_/common.vue} | 17 +- .../_common_}/stream-indicator.vue | 0 .../{components => ui/_common_}/upload.vue | 0 src/client/ui/deck.vue | 4 +- src/client/ui/default.side.vue | 157 ++++++++++++++++++ src/client/ui/default.vue | 26 ++- src/client/ui/visitor.vue | 18 +- src/client/ui/zen.vue | 4 +- src/client/widgets/trends.vue | 2 +- 59 files changed, 625 insertions(+), 220 deletions(-) create mode 100644 src/client/components/ui/a.vue rename src/client/{root.vue => ui/_common_/common.vue} (65%) rename src/client/{components => ui/_common_}/stream-indicator.vue (100%) rename src/client/{components => ui/_common_}/upload.vue (100%) create mode 100644 src/client/ui/default.side.vue diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index bccb82e51b..ae3110a7d0 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -593,6 +593,9 @@ fillAbuseReportDescription: "通報理由の詳細を記入してください。 abuseReported: "内容が送信されました。ご報告ありがとうございました。" send: "送信" abuseMarkAsResolved: "対応済みにする" +openInNewTab: "新しいタブで開く" +openInSideView: "サイドビューで開く" +defaultNavigationBehaviour: "デフォルトのナビゲーション" _serverDisconnectedBehavior: reload: "自動でリロード" diff --git a/src/client/components/avatar.vue b/src/client/components/avatar.vue index 627818a8e7..d90607bb8a 100644 --- a/src/client/components/avatar.vue +++ b/src/client/components/avatar.vue @@ -2,9 +2,9 @@ - + - + diff --git a/src/client/components/ui/context-menu.vue b/src/client/components/ui/context-menu.vue index 98586cf3fe..3a11589e8a 100644 --- a/src/client/components/ui/context-menu.vue +++ b/src/client/components/ui/context-menu.vue @@ -1,5 +1,5 @@ diff --git a/src/client/components/ui/menu.vue b/src/client/components/ui/menu.vue index 5e74828c20..9e4e319c8a 100644 --- a/src/client/components/ui/menu.vue +++ b/src/client/components/ui/menu.vue @@ -12,12 +12,12 @@ - + {{ item.text }} - + {{ item.text }} diff --git a/src/client/components/ui/radio.vue b/src/client/components/ui/radio.vue index 8f2b843ee6..890ff08751 100644 --- a/src/client/components/ui/radio.vue +++ b/src/client/components/ui/radio.vue @@ -51,7 +51,7 @@ export default defineComponent({ .novjtctn { position: relative; display: inline-block; - margin: 0 32px 0 0; + margin: 16px 32px 0 0; cursor: pointer; transition: all 0.3s; diff --git a/src/client/components/ui/window.vue b/src/client/components/ui/window.vue index d545ac4827..4c90ab9c8d 100644 --- a/src/client/components/ui/window.vue +++ b/src/client/components/ui/window.vue @@ -2,14 +2,16 @@
-
- +
+ + + - - - + + +
@@ -85,6 +87,15 @@ export default defineComponent({ required: false, default: false, }, + closeRight: { + type: Boolean, + required: false, + default: false, + }, + contextmenu: { + type: Array, + required: false, + } }, emits: ['closed'], @@ -129,6 +140,12 @@ export default defineComponent({ } }, + onContextmenu(e) { + if (this.contextmenu) { + os.contextMenu(this.contextmenu, e); + } + }, + // 最前面へ移動 top() { let z = 0; diff --git a/src/client/components/url-preview.vue b/src/client/components/url-preview.vue index df02698b5d..55872113be 100644 --- a/src/client/components/url-preview.vue +++ b/src/client/components/url-preview.vue @@ -8,7 +8,7 @@
- +
diff --git a/src/client/components/url.vue b/src/client/components/url.vue index 649ce5fa24..ceb0381f87 100644 --- a/src/client/components/url.vue +++ b/src/client/components/url.vue @@ -1,5 +1,5 @@