From c4603c7a96b49091c7184c13fecd614b84b95c02 Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Wed, 21 Dec 2022 08:39:28 +0900 Subject: [PATCH] :art: Fix #9374 --- packages/client/src/components/MkDrive.file.vue | 4 ++-- packages/client/src/components/MkDrive.folder.vue | 2 +- packages/client/src/components/MkDrive.vue | 2 +- packages/client/src/components/MkModalPageWindow.vue | 2 +- packages/client/src/components/MkPageWindow.vue | 8 ++------ packages/client/src/components/MkPostFormAttaches.vue | 4 ++-- packages/client/src/components/MkSuperMenu.vue | 6 +++--- packages/client/src/components/MkWindow.vue | 4 ++-- packages/client/src/components/global/MkA.vue | 2 +- packages/client/src/navbar.ts | 2 +- packages/client/src/pages/settings/index.vue | 2 +- .../client/src/pages/settings/preferences-backups.vue | 2 +- packages/client/src/ui/deck/widgets-column.vue | 2 +- packages/client/src/ui/universal.vue | 4 ++-- 14 files changed, 21 insertions(+), 25 deletions(-) diff --git a/packages/client/src/components/MkDrive.file.vue b/packages/client/src/components/MkDrive.file.vue index 4ac63d5b9..11bd9e9e3 100644 --- a/packages/client/src/components/MkDrive.file.vue +++ b/packages/client/src/components/MkDrive.file.vue @@ -63,7 +63,7 @@ const title = computed(() => `${props.file.name}\n${props.file.type} ${bytes(pro function getMenu() { return [{ text: i18n.ts.rename, - icon: 'ti ti-cursor-text', + icon: 'ti ti-forms', action: rename, }, { text: props.file.isSensitive ? i18n.ts.unmarkAsSensitive : i18n.ts.markAsSensitive, @@ -71,7 +71,7 @@ function getMenu() { action: toggleSensitive, }, { text: i18n.ts.describeFile, - icon: 'ti ti-cursor-text', + icon: 'ti ti-forms', action: describe, }, null, { text: i18n.ts.copyUrl, diff --git a/packages/client/src/components/MkDrive.folder.vue b/packages/client/src/components/MkDrive.folder.vue index 8ba24e23f..04f1c940b 100644 --- a/packages/client/src/components/MkDrive.folder.vue +++ b/packages/client/src/components/MkDrive.folder.vue @@ -253,7 +253,7 @@ function onContextmenu(ev: MouseEvent) { }, }, null, { text: i18n.ts.rename, - icon: 'ti ti-cursor-text', + icon: 'ti ti-forms', action: rename, }, null, { text: i18n.ts.delete, diff --git a/packages/client/src/components/MkDrive.vue b/packages/client/src/components/MkDrive.vue index bf8368599..c91fc95ab 100644 --- a/packages/client/src/components/MkDrive.vue +++ b/packages/client/src/components/MkDrive.vue @@ -599,7 +599,7 @@ function getMenu() { type: 'label', }, folder.value ? { text: i18n.ts.renameFolder, - icon: 'ti ti-cursor-text', + icon: 'ti ti-forms', action: () => { renameFolder(folder.value); }, } : undefined, folder.value ? { text: i18n.ts.deleteFolder, diff --git a/packages/client/src/components/MkModalPageWindow.vue b/packages/client/src/components/MkModalPageWindow.vue index fb59e6721..ced8a7a71 100644 --- a/packages/client/src/components/MkModalPageWindow.vue +++ b/packages/client/src/components/MkModalPageWindow.vue @@ -68,7 +68,7 @@ const contextmenu = $computed(() => { type: 'label', text: path, }, { - icon: 'ti ti-corner-right-down-double', + icon: 'ti ti-player-eject', text: i18n.ts.showInPage, action: expand, }, { diff --git a/packages/client/src/components/MkPageWindow.vue b/packages/client/src/components/MkPageWindow.vue index a0615893f..29d45558a 100644 --- a/packages/client/src/components/MkPageWindow.vue +++ b/packages/client/src/components/MkPageWindow.vue @@ -66,7 +66,7 @@ const buttonsLeft = $computed(() => { }); const buttonsRight = $computed(() => { const buttons = [{ - icon: 'ti ti-corner-right-down-double', + icon: 'ti ti-player-eject', title: i18n.ts.showInPage, onClick: expand, }]; @@ -86,7 +86,7 @@ provide('shouldOmitHeaderTitle', true); provide('shouldHeaderThin', true); const contextmenu = $computed(() => ([{ - icon: 'ti ti-corner-right-down-double', + icon: 'ti ti-player-eject', text: i18n.ts.showInPage, action: expand, }, { @@ -108,10 +108,6 @@ const contextmenu = $computed(() => ([{ }, }])); -function menu(ev) { - os.popupMenu(contextmenu, ev.currentTarget ?? ev.target); -} - function back() { history.pop(); router.replace(history[history.length - 1].path, history[history.length - 1].key); diff --git a/packages/client/src/components/MkPostFormAttaches.vue b/packages/client/src/components/MkPostFormAttaches.vue index b533786d3..9eeffa55d 100644 --- a/packages/client/src/components/MkPostFormAttaches.vue +++ b/packages/client/src/components/MkPostFormAttaches.vue @@ -113,7 +113,7 @@ export default defineComponent({ if (this.menu) return; this.menu = os.popupMenu([{ text: this.$ts.renameFile, - icon: 'ti ti-cursor-text', + icon: 'ti ti-forms', action: () => { this.rename(file); }, }, { text: file.isSensitive ? this.$ts.unmarkAsSensitive : this.$ts.markAsSensitive, @@ -121,7 +121,7 @@ export default defineComponent({ action: () => { this.toggleSensitive(file); }, }, { text: this.$ts.describeFile, - icon: 'ti ti-cursor-text', + icon: 'ti ti-forms', action: () => { this.describe(file); }, }, { text: this.$ts.attachCancel, diff --git a/packages/client/src/components/MkSuperMenu.vue b/packages/client/src/components/MkSuperMenu.vue index a5e7856e2..e79794aea 100644 --- a/packages/client/src/components/MkSuperMenu.vue +++ b/packages/client/src/components/MkSuperMenu.vue @@ -116,7 +116,7 @@ export default defineComponent({ > .items { display: grid; - grid-template-columns: repeat(auto-fill, minmax(80px, 1fr)); + grid-template-columns: repeat(auto-fill, minmax(70px, 1fr)); grid-gap: 16px; padding: 0 16px; @@ -141,8 +141,8 @@ export default defineComponent({ margin-right: 0; margin-bottom: 6px; font-size: 1.5em; - width: 32px; - height: 32px; + width: 54px; + height: 54px; aspect-ratio: 1; background: var(--panel); border-radius: 100%; diff --git a/packages/client/src/components/MkWindow.vue b/packages/client/src/components/MkWindow.vue index d9c0035a8..629c10581 100644 --- a/packages/client/src/components/MkWindow.vue +++ b/packages/client/src/components/MkWindow.vue @@ -11,8 +11,8 @@ </span> <span class="right"> <button v-for="button in buttonsRight" v-tooltip="button.title" class="button _button" :class="{ highlighted: button.highlighted }" @click="button.onClick"><i :class="button.icon"></i></button> - <button v-if="canResize && maximized" v-tooltip="i18n.ts.windowRestore" class="button _button" @click="unMaximize()"><i class="ti ti-app-window"></i></button> - <button v-else-if="canResize && !maximized" v-tooltip="i18n.ts.windowMaximize" class="button _button" @click="maximize()"><i class="ti ti-arrows-maximize"></i></button> + <button v-if="canResize && maximized" v-tooltip="i18n.ts.windowRestore" class="button _button" @click="unMaximize()"><i class="ti ti-picture-in-picture"></i></button> + <button v-else-if="canResize && !maximized" v-tooltip="i18n.ts.windowMaximize" class="button _button" @click="maximize()"><i class="ti ti-rectangle"></i></button> <button v-if="closeButton" v-tooltip="i18n.ts.close" class="button _button" @click="close()"><i class="ti ti-x"></i></button> </span> </div> diff --git a/packages/client/src/components/global/MkA.vue b/packages/client/src/components/global/MkA.vue index a686d1bdb..5a0ba0d8d 100644 --- a/packages/client/src/components/global/MkA.vue +++ b/packages/client/src/components/global/MkA.vue @@ -47,7 +47,7 @@ function onContextmenu(ev) { os.pageWindow(props.to); }, }, { - icon: 'ti ti-corner-right-down-double', + icon: 'ti ti-player-eject', text: i18n.ts.showInPage, action: () => { router.push(props.to, 'forcePage'); diff --git a/packages/client/src/navbar.ts b/packages/client/src/navbar.ts index e1f64ac05..6b27b42cf 100644 --- a/packages/client/src/navbar.ts +++ b/packages/client/src/navbar.ts @@ -99,7 +99,7 @@ export const navbarItemDef = reactive({ }, ui: { title: 'switchUi', - icon: 'ti ti-columns', + icon: 'ti ti-devices', action: (ev) => { os.popupMenu([{ text: i18n.ts.default, diff --git a/packages/client/src/pages/settings/index.vue b/packages/client/src/pages/settings/index.vue index 5c9d8a8ef..01436cd55 100644 --- a/packages/client/src/pages/settings/index.vue +++ b/packages/client/src/pages/settings/index.vue @@ -186,7 +186,7 @@ const menuDef = computed(() => [{ }, }, { type: 'button', - icon: 'ti ti-logout', + icon: 'ti ti-power', text: i18n.ts.logout, action: async () => { const { canceled } = await os.confirm({ diff --git a/packages/client/src/pages/settings/preferences-backups.vue b/packages/client/src/pages/settings/preferences-backups.vue index 379f65bef..d2a2dc01c 100644 --- a/packages/client/src/pages/settings/preferences-backups.vue +++ b/packages/client/src/pages/settings/preferences-backups.vue @@ -386,7 +386,7 @@ function menu(ev: MouseEvent, profileId: string) { download: `${profiles[profileId].name}.json`, }, null, { text: ts.rename, - icon: 'ti ti-cursor-text', + icon: 'ti ti-forms', action: () => rename(profileId), }, { text: ts._preferencesBackups.save, diff --git a/packages/client/src/ui/deck/widgets-column.vue b/packages/client/src/ui/deck/widgets-column.vue index 0bcdc4f76..fc61d18ff 100644 --- a/packages/client/src/ui/deck/widgets-column.vue +++ b/packages/client/src/ui/deck/widgets-column.vue @@ -1,6 +1,6 @@ <template> <XColumn :menu="menu" :naked="true" :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)"> - <template #header><i class="ti ti-layout-list" style="margin-right: 8px;"></i>{{ column.name }}</template> + <template #header><i class="ti ti-apps" style="margin-right: 8px;"></i>{{ column.name }}</template> <div class="wtdtxvec"> <div v-if="!(column.widgets && column.widgets.length > 0) && !edit" class="intro">{{ i18n.ts._deck.widgetsIntroduction }}</div> diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue index 778ad5356..b91bf476e 100644 --- a/packages/client/src/ui/universal.vue +++ b/packages/client/src/ui/universal.vue @@ -16,13 +16,13 @@ <XWidgets @mounted="attachSticky"/> </div> - <button v-if="!isDesktop && !isMobile" class="widgetButton _button" @click="widgetsShowing = true"><i class="ti ti-layout-list"></i></button> + <button v-if="!isDesktop && !isMobile" class="widgetButton _button" @click="widgetsShowing = true"><i class="ti ti-apps"></i></button> <div v-if="isMobile" class="buttons"> <button class="button nav _button" @click="drawerMenuShowing = true"><i class="ti ti-menu-2"></i><span v-if="menuIndicated" class="indicator"><i class="_indicatorCircle"></i></span></button> <button class="button home _button" @click="mainRouter.currentRoute.value.name === 'index' ? top() : mainRouter.push('/')"><i class="ti ti-home"></i></button> <button class="button notifications _button" @click="mainRouter.push('/my/notifications')"><i class="ti ti-bell"></i><span v-if="$i?.hasUnreadNotification" class="indicator"><i class="_indicatorCircle"></i></span></button> - <button class="button widget _button" @click="widgetsShowing = true"><i class="ti ti-layout-list"></i></button> + <button class="button widget _button" @click="widgetsShowing = true"><i class="ti ti-apps"></i></button> <button class="button post _button" @click="os.post()"><i class="ti ti-pencil"></i></button> </div>