From 048ed26f4137e994d93b0a2cb35130c4403d2f5a Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 9 Aug 2021 12:28:23 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=E9=80=A3=E5=90=88=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E3=82=BF=E3=83=B3=E3=82=B9=E8=A8=AD=E5=AE=9A=E3=83=80?= =?UTF-8?q?=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/pages/instance-info.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/client/pages/instance-info.vue b/src/client/pages/instance-info.vue index 4165f73734..7d03c0847d 100644 --- a/src/client/pages/instance-info.vue +++ b/src/client/pages/instance-info.vue @@ -14,6 +14,8 @@ + {{ $ts.settings }} + {{ $ts.description }} @@ -147,6 +149,7 @@ import * as os from '@client/os'; import number from '@client/filters/number'; import bytes from '@client/filters/bytes'; import * as symbols from '@client/symbols'; +import MkInstanceInfo from '@client/pages/instance/instance.vue'; const chartLimit = 90; const sum = (...arr) => arr.reduce((r, a) => r.map((b, i) => a[i] + b)); @@ -440,6 +443,12 @@ export default defineComponent({ }] }; }, + + info() { + os.popup(MkInstanceInfo, { + instance: this.instance + }, {}, 'closed'); + } } }); From 1c764139bf9dfa5575ea32cfa0a4eecf9690cd7d Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 9 Aug 2021 18:01:12 +0900 Subject: [PATCH 2/6] :art: --- src/client/components/emoji-picker-dialog.vue | 157 ++---------------- src/client/components/emoji-picker.vue | 3 +- src/client/components/poll-editor.vue | 3 +- src/client/components/ui/button.vue | 1 + src/client/components/ui/menu.vue | 24 ++- src/client/components/ui/popup-menu.vue | 4 +- src/client/components/ui/popup.vue | 5 +- src/client/components/ui/window.vue | 1 + src/client/pages/doc.vue | 2 +- src/client/pages/my-lists/index.vue | 15 +- src/client/style.scss | 2 +- 11 files changed, 61 insertions(+), 156 deletions(-) diff --git a/src/client/components/emoji-picker-dialog.vue b/src/client/components/emoji-picker-dialog.vue index 9aca47f547..aa17b8b250 100644 --- a/src/client/components/emoji-picker-dialog.vue +++ b/src/client/components/emoji-picker-dialog.vue @@ -1,6 +1,6 @@ @@ -56,145 +56,20 @@ export default defineComponent({