mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-02 16:58:43 +09:00
Code

🎨

Browse Source 
Fix #9374
This commit is contained in:
syuilo 2022-12-21 08:39:28 +09:00
parent cae4acfbd3
commit c4603c7a96
14 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/client/src/components/MkDrive.file.vue
View File

@ -63,7 +63,7 @@ const title = computed(() => `${props.file.name}\n${props.file.type} ${bytes(pro
function getMenu() { function getMenu() {
return [{ return [{
text: i18n.ts.rename, text: i18n.ts.rename,
icon: 'ti ti-cursor-text', icon: 'ti ti-forms',
action: rename, action: rename,
}, { }, {
text: props.file.isSensitive ? i18n.ts.unmarkAsSensitive : i18n.ts.markAsSensitive, text: props.file.isSensitive ? i18n.ts.unmarkAsSensitive : i18n.ts.markAsSensitive,
@ -71,7 +71,7 @@ function getMenu() {
action: toggleSensitive, action: toggleSensitive,
}, { }, {
text: i18n.ts.describeFile, text: i18n.ts.describeFile,
icon: 'ti ti-cursor-text', icon: 'ti ti-forms',
action: describe, action: describe,
}, null, { }, null, {
text: i18n.ts.copyUrl, text: i18n.ts.copyUrl,

2
packages/client/src/components/MkDrive.folder.vue
View File

@ -253,7 +253,7 @@ function onContextmenu(ev: MouseEvent) {
}, },
}, null, { }, null, {
text: i18n.ts.rename, text: i18n.ts.rename,
icon: 'ti ti-cursor-text', icon: 'ti ti-forms',
action: rename, action: rename,
}, null, { }, null, {
text: i18n.ts.delete, text: i18n.ts.delete,

2
packages/client/src/components/MkDrive.vue
View File

@ -599,7 +599,7 @@ function getMenu() {
type: 'label', type: 'label',
}, folder.value ? { }, folder.value ? {
text: i18n.ts.renameFolder, text: i18n.ts.renameFolder,
icon: 'ti ti-cursor-text', icon: 'ti ti-forms',
action: () => { renameFolder(folder.value); }, action: () => { renameFolder(folder.value); },
} : undefined, folder.value ? { } : undefined, folder.value ? {
text: i18n.ts.deleteFolder, text: i18n.ts.deleteFolder,

2
packages/client/src/components/MkModalPageWindow.vue
View File

@ -68,7 +68,7 @@ const contextmenu = $computed(() => {
type: 'label', type: 'label',
text: path, text: path,
}, { }, {
icon: 'ti ti-corner-right-down-double', icon: 'ti ti-player-eject',
text: i18n.ts.showInPage, text: i18n.ts.showInPage,
action: expand, action: expand,
}, { }, {

8
packages/client/src/components/MkPageWindow.vue
View File

@ -66,7 +66,7 @@ const buttonsLeft = $computed(() => {
}); });
const buttonsRight = $computed(() => { const buttonsRight = $computed(() => {
const buttons = [{ const buttons = [{
icon: 'ti ti-corner-right-down-double', icon: 'ti ti-player-eject',
title: i18n.ts.showInPage, title: i18n.ts.showInPage,
onClick: expand, onClick: expand,
}]; }];
@ -86,7 +86,7 @@ provide('shouldOmitHeaderTitle', true);
provide('shouldHeaderThin', true); provide('shouldHeaderThin', true);
const contextmenu = $computed(() => ([{ const contextmenu = $computed(() => ([{
icon: 'ti ti-corner-right-down-double', icon: 'ti ti-player-eject',
text: i18n.ts.showInPage, text: i18n.ts.showInPage,
action: expand, action: expand,
}, { }, {
@ -108,10 +108,6 @@ const contextmenu = $computed(() => ([{
}, },
}])); }]));
function menu(ev) {
os.popupMenu(contextmenu, ev.currentTarget ?? ev.target);
}
function back() { function back() {
history.pop(); history.pop();
router.replace(history[history.length - 1].path, history[history.length - 1].key); router.replace(history[history.length - 1].path, history[history.length - 1].key);

4
packages/client/src/components/MkPostFormAttaches.vue
View File

@ -113,7 +113,7 @@ export default defineComponent({
if (this.menu) return; if (this.menu) return;
this.menu = os.popupMenu([{ this.menu = os.popupMenu([{
text: this.$ts.renameFile, text: this.$ts.renameFile,
icon: 'ti ti-cursor-text', icon: 'ti ti-forms',
action: () => { this.rename(file); }, action: () => { this.rename(file); },
}, { }, {
text: file.isSensitive ? this.$ts.unmarkAsSensitive : this.$ts.markAsSensitive, text: file.isSensitive ? this.$ts.unmarkAsSensitive : this.$ts.markAsSensitive,
@ -121,7 +121,7 @@ export default defineComponent({
action: () => { this.toggleSensitive(file); }, action: () => { this.toggleSensitive(file); },
}, { }, {
text: this.$ts.describeFile, text: this.$ts.describeFile,
icon: 'ti ti-cursor-text', icon: 'ti ti-forms',
action: () => { this.describe(file); }, action: () => { this.describe(file); },
}, { }, {
text: this.$ts.attachCancel, text: this.$ts.attachCancel,

6
packages/client/src/components/MkSuperMenu.vue
View File

@ -116,7 +116,7 @@ export default defineComponent({
> .items { > .items {
display: grid; display: grid;
grid-template-columns: repeat(auto-fill, minmax(80px, 1fr)); grid-template-columns: repeat(auto-fill, minmax(70px, 1fr));
grid-gap: 16px; grid-gap: 16px;
padding: 0 16px; padding: 0 16px;
@ -141,8 +141,8 @@ export default defineComponent({
margin-right: 0; margin-right: 0;
margin-bottom: 6px; margin-bottom: 6px;
font-size: 1.5em; font-size: 1.5em;
width: 32px; width: 54px;
height: 32px; height: 54px;
aspect-ratio: 1; aspect-ratio: 1;
background: var(--panel); background: var(--panel);
border-radius: 100%; border-radius: 100%;

4
packages/client/src/components/MkWindow.vue
View File

@ -11,8 +11,8 @@
</span> </span>
<span class="right"> <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-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-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-arrows-maximize"></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> <button v-if="closeButton" v-tooltip="i18n.ts.close" class="button _button" @click="close()"><i class="ti ti-x"></i></button>
</span> </span>
</div> </div>

2
packages/client/src/components/global/MkA.vue
View File

@ -47,7 +47,7 @@ function onContextmenu(ev) {
os.pageWindow(props.to); os.pageWindow(props.to);
}, },
}, { }, {
icon: 'ti ti-corner-right-down-double', icon: 'ti ti-player-eject',
text: i18n.ts.showInPage, text: i18n.ts.showInPage,
action: () => { action: () => {
router.push(props.to, 'forcePage'); router.push(props.to, 'forcePage');

2
packages/client/src/navbar.ts
View File

@ -99,7 +99,7 @@ export const navbarItemDef = reactive({
}, },
ui: { ui: {
title: 'switchUi', title: 'switchUi',
icon: 'ti ti-columns', icon: 'ti ti-devices',
action: (ev) => { action: (ev) => {
os.popupMenu([{ os.popupMenu([{
text: i18n.ts.default, text: i18n.ts.default,

2
packages/client/src/pages/settings/index.vue
View File

@ -186,7 +186,7 @@ const menuDef = computed(() => [{
}, },
}, { }, {
type: 'button', type: 'button',
icon: 'ti ti-logout', icon: 'ti ti-power',
text: i18n.ts.logout, text: i18n.ts.logout,
action: async () => { action: async () => {
const { canceled } = await os.confirm({ const { canceled } = await os.confirm({

2
packages/client/src/pages/settings/preferences-backups.vue
View File

@ -386,7 +386,7 @@ function menu(ev: MouseEvent, profileId: string) {
download: `${profiles[profileId].name}.json`, download: `${profiles[profileId].name}.json`,
}, null, { }, null, {
text: ts.rename, text: ts.rename,
icon: 'ti ti-cursor-text', icon: 'ti ti-forms',
action: () => rename(profileId), action: () => rename(profileId),
}, { }, {
text: ts._preferencesBackups.save, text: ts._preferencesBackups.save,

2
packages/client/src/ui/deck/widgets-column.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<XColumn :menu="menu" :naked="true" :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)"> <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 class="wtdtxvec">
<div v-if="!(column.widgets && column.widgets.length > 0) && !edit" class="intro">{{ i18n.ts._deck.widgetsIntroduction }}</div> <div v-if="!(column.widgets && column.widgets.length > 0) && !edit" class="intro">{{ i18n.ts._deck.widgetsIntroduction }}</div>

4
packages/client/src/ui/universal.vue
View File

@ -16,13 +16,13 @@
<XWidgets @mounted="attachSticky"/> <XWidgets @mounted="attachSticky"/>
</div> </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"> <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 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 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 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> <button class="button post _button" @click="os.post()"><i class="ti ti-pencil"></i></button>
</div> </div>