From d7222dd56adb0da6e81c84ea93651cf1901450c8 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 17 Jul 2022 21:06:33 +0900 Subject: [PATCH 01/10] enhance(client): tweak ui --- packages/client/src/components/launch-pad.vue | 36 ---- .../client/src/components/ui/child-menu.vue | 63 ++++++ packages/client/src/components/ui/menu.vue | 187 +++++++++++++----- .../client/src/components/ui/popup-menu.vue | 2 +- packages/client/src/components/ui/tooltip.vue | 158 ++------------- packages/client/src/scripts/popup-position.ts | 158 +++++++++++++++ packages/client/src/types/menu.ts | 7 +- packages/client/src/ui/_common_/common.vue | 66 +++---- .../src/ui/_common_/navbar-for-mobile.vue | 30 +++ packages/client/src/ui/_common_/navbar.vue | 30 +++ 10 files changed, 462 insertions(+), 275 deletions(-) create mode 100644 packages/client/src/components/ui/child-menu.vue create mode 100644 packages/client/src/scripts/popup-position.ts diff --git a/packages/client/src/components/launch-pad.vue b/packages/client/src/components/launch-pad.vue index 4693df2916..7891f61bf1 100644 --- a/packages/client/src/components/launch-pad.vue +++ b/packages/client/src/components/launch-pad.vue @@ -15,20 +15,6 @@ -
- - - -
{{ $ts.instanceInfo }}
- - - -
{{ $ts.aboutMisskey }}
- -
@@ -74,28 +60,6 @@ const items = Object.keys(navbarItemDef).filter(k => !menu.includes(k)).map(k => function close() { modal.close(); } - -function help(ev: MouseEvent) { - os.popupMenu([{ - type: 'link', - to: '/mfm-cheat-sheet', - text: i18n.ts._mfm.cheatSheet, - icon: 'fas fa-code', - }, { - type: 'link', - to: '/scratchpad', - text: i18n.ts.scratchpad, - icon: 'fas fa-terminal', - }, null, { - text: i18n.ts.document, - icon: 'fas fa-question-circle', - action: () => { - window.open('https://misskey-hub.net/help.html', '_blank'); - }, - }], ev.currentTarget ?? ev.target); - - close(); -} diff --git a/packages/client/src/components/ui/menu.vue b/packages/client/src/components/ui/menu.vue index 6ad63c2ad7..26283ffe55 100644 --- a/packages/client/src/components/ui/menu.vue +++ b/packages/client/src/components/ui/menu.vue @@ -1,55 +1,67 @@ diff --git a/packages/client/src/components/ui/menu.vue b/packages/client/src/components/ui/menu.vue index 26283ffe55..6d1a2cc770 100644 --- a/packages/client/src/components/ui/menu.vue +++ b/packages/client/src/components/ui/menu.vue @@ -50,7 +50,7 @@
- +
@@ -61,7 +61,7 @@ import { focusPrev, focusNext } from '@/scripts/focus'; import FormSwitch from '@/components/form/switch.vue'; import { MenuItem, InnerMenuItem, MenuPending, MenuAction } from '@/types/menu'; import * as os from '@/os'; -const XChild = defineAsyncComponent(() => import('./child-menu.vue')); +const XChild = defineAsyncComponent(() => import('./menu.child.vue')); const props = defineProps<{ items: MenuItem[]; diff --git a/packages/client/src/pages/settings/profile.vue b/packages/client/src/pages/settings/profile.vue index f30b0ccbdc..20c51c8836 100644 --- a/packages/client/src/pages/settings/profile.vue +++ b/packages/client/src/pages/settings/profile.vue @@ -3,9 +3,9 @@
- {{ i18n.ts._profile.changeAvatar }} + {{ i18n.ts._profile.changeAvatar }}
- {{ i18n.ts._profile.changeBanner }} + {{ i18n.ts._profile.changeBanner }}
diff --git a/packages/client/src/ui/deck/column.vue b/packages/client/src/ui/deck/column.vue index 1a1bd7d266..7b30ffad45 100644 --- a/packages/client/src/ui/deck/column.vue +++ b/packages/client/src/ui/deck/column.vue @@ -128,31 +128,36 @@ function getMenu() { if (canceled) return; updateColumn(props.column.id, result); }, - }, null, { - icon: 'fas fa-arrow-left', - text: i18n.ts._deck.swapLeft, - action: () => { - swapLeftColumn(props.column.id); - }, }, { - icon: 'fas fa-arrow-right', - text: i18n.ts._deck.swapRight, - action: () => { - swapRightColumn(props.column.id); - }, - }, props.isStacked ? { - icon: 'fas fa-arrow-up', - text: i18n.ts._deck.swapUp, - action: () => { - swapUpColumn(props.column.id); - }, - } : undefined, props.isStacked ? { - icon: 'fas fa-arrow-down', - text: i18n.ts._deck.swapDown, - action: () => { - swapDownColumn(props.column.id); - }, - } : undefined, null, { + type: 'parent', + text: i18n.ts.move + '...', + icon: 'fas fa-arrows-up-down-left-right', + children: [{ + icon: 'fas fa-arrow-left', + text: i18n.ts._deck.swapLeft, + action: () => { + swapLeftColumn(props.column.id); + }, + }, { + icon: 'fas fa-arrow-right', + text: i18n.ts._deck.swapRight, + action: () => { + swapRightColumn(props.column.id); + }, + }, props.isStacked ? { + icon: 'fas fa-arrow-up', + text: i18n.ts._deck.swapUp, + action: () => { + swapUpColumn(props.column.id); + }, + } : undefined, props.isStacked ? { + icon: 'fas fa-arrow-down', + text: i18n.ts._deck.swapDown, + action: () => { + swapDownColumn(props.column.id); + }, + } : undefined], + }, { icon: 'fas fa-window-restore', text: i18n.ts._deck.stackLeft, action: () => { From 01d7403dc4b50ab2a813ec3a214708f6c1782cac Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 18 Jul 2022 00:18:56 +0900 Subject: [PATCH 03/10] :art: --- packages/client/src/store.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts index 5033333313..3971214af0 100644 --- a/packages/client/src/store.ts +++ b/packages/client/src/store.ts @@ -270,7 +270,7 @@ type Plugin = { * 常にメモリにロードしておく必要がないような設定情報を保管するストレージ(非リアクティブ) */ import lightTheme from '@/themes/l-light.json5'; -import darkTheme from '@/themes/d-dark.json5'; +import darkTheme from '@/themes/d-green-lime.json5'; export class ColdDeviceStorage { public static default = { From e9a97b471796c58b946a656372aeaddab871a292 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 18 Jul 2022 00:31:55 +0900 Subject: [PATCH 04/10] =?UTF-8?q?enhance(client):=20=E3=82=A6=E3=82=A3?= =?UTF-8?q?=E3=83=B3=E3=83=89=E3=82=A6=E3=82=92=E6=9C=80=E5=A4=A7=E5=8C=96?= =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 9 + packages/client/src/components/ui/window.vue | 586 ++++++++++--------- 2 files changed, 316 insertions(+), 279 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfaf06ea81..aa253d11ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,15 @@ You should also include the user name that made the change. --> +## 12.x.x (unreleased) + +### Improvements +- Client: ウィンドウを最大化できるように @syuilo +- Client: UIのブラッシュアップ @syuilo + +### Bugfixes +- + ## 12.116.1 (2022/07/17) ### Bugfixes diff --git a/packages/client/src/components/ui/window.vue b/packages/client/src/components/ui/window.vue index d155033824..1208619177 100644 --- a/packages/client/src/components/ui/window.vue +++ b/packages/client/src/components/ui/window.vue @@ -1,6 +1,6 @@ - From 61d8b56eeef523a02db61f6874330fe08c477db9 Mon Sep 17 00:00:00 2001 From: Ryu jongheon Date: Mon, 18 Jul 2022 00:33:12 +0900 Subject: [PATCH 05/10] fix(client): use icon for local if available (#9012) --- packages/client/src/components/instance-ticker.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/client/src/components/instance-ticker.vue b/packages/client/src/components/instance-ticker.vue index c32409ecf4..d9f196f887 100644 --- a/packages/client/src/components/instance-ticker.vue +++ b/packages/client/src/components/instance-ticker.vue @@ -8,6 +8,7 @@ diff --git a/packages/client/src/components/ui/window.vue b/packages/client/src/components/ui/window.vue index 1208619177..e259ecdab3 100644 --- a/packages/client/src/components/ui/window.vue +++ b/packages/client/src/components/ui/window.vue @@ -1,6 +1,6 @@