feat: 💄 Phosphor icons!

This commit is contained in:
ThatOneCalculator 2022-11-06 17:33:52 -08:00
parent d3522f6c3f
commit b3a5fdb1e0
257 changed files with 1046 additions and 1035 deletions

View file

@ -48,6 +48,7 @@
- Star as default reaction
- Like/star button
- Rosé Pine by default (+ non-themable elements made Rosé Pine)
- Phosphor icons instead of FontAwesome
- Better sidebar/navbar
- Add back groups
- Integrate groups UI into chats UI

View file

@ -23,8 +23,8 @@ gulp.task('copy:client:fonts', () =>
gulp.src('./packages/client/node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/_client_dist_/fonts/'))
);
gulp.task('copy:client:fontawesome', () =>
gulp.src('./packages/client/node_modules/@fortawesome/fontawesome-free/**/*').pipe(gulp.dest('./built/_client_dist_/fontawesome/'))
gulp.task('copy:client:phosphor', () =>
gulp.src('./packages/client/node_modules/phosphor-icons/src/css/*').pipe(gulp.dest('./built/_client_dist_/phosphor/'))
);
gulp.task('copy:client:locales', cb => {
@ -58,7 +58,7 @@ gulp.task('build:backend:style', () => {
});
gulp.task('build', gulp.parallel(
'copy:client:locales', 'copy:backend:views', 'copy:backend:custom', 'build:backend:script', 'build:backend:style', 'copy:client:fonts', 'copy:client:fontawesome'
'copy:client:locales', 'copy:backend:views', 'copy:backend:custom', 'build:backend:script', 'build:backend:style', 'copy:client:fonts', 'copy:client:phosphor'
));
gulp.task('default', gulp.task('build'));

View file

@ -1,6 +1,6 @@
{
"name": "calckey",
"version": "12.119.0-calc.8.1",
"version": "12.119.0-calc.8.2",
"codename": "aqua",
"repository": {
"type": "git",
@ -51,6 +51,7 @@
"gulp-terser": "2.1.0",
"js-yaml": "4.1.0",
"long": "^5.2.1",
"phosphor-icons": "^1.4.2",
"seedrandom": "^3.0.5"
},
"devDependencies": {

View file

@ -35,7 +35,7 @@ html
link(rel='prefetch' href=`/static-assets/badges/info.png?${ nowDateMs }`)
link(rel='prefetch' href=`/static-assets/badges/not-found.png?${ nowDateMs }`)
link(rel='prefetch' href=`/static-assets/badges/error.png?${ nowDateMs }`)
link(rel='stylesheet' href='/assets/fontawesome/css/all.css')
link(rel='stylesheet' href='/assets/phosphor/css/icons.css')
link(rel='stylesheet' href=`/static-assets/instance.css?${ nowDateMs }`)
link(rel='modulepreload' href=`/assets/${clientEntry.file}`)

View file

@ -207,7 +207,7 @@ export async function openAccountMenu(opts: {
avatar: $i,
}, null, ...(opts.includeCurrentAccount ? [createItem($i)] : []), ...accountItemPromises, {
type: 'parent',
icon: 'fas fa-plus',
icon: 'ph-plus',
text: i18n.ts.addAccount,
children: [{
text: i18n.ts.existingAccount,
@ -218,7 +218,7 @@ export async function openAccountMenu(opts: {
}],
}, {
type: 'link',
icon: 'fas fa-users',
icon: 'ph-users',
text: i18n.ts.manageAccounts,
to: '/settings/accounts',
}]], ev.currentTarget ?? ev.target, {

View file

@ -1,7 +1,7 @@
<template>
<XWindow ref="uiWindow" :initial-width="400" :initial-height="500" :can-resize="true" @closed="emit('closed')">
<template #header>
<i class="fas fa-exclamation-circle" style="margin-right: 0.5em;"></i>
<i class="ph-warning-circle" style="margin-right: 0.5em;"></i>
<I18n :src="i18n.ts.reportAbuseOf" tag="span">
<template #name>
<b><MkAcct :user="user"/></b>

View file

@ -6,14 +6,14 @@
>
<template v-if="!wait">
<template v-if="isFollowing">
<span v-if="full">{{ i18n.ts.unfollow }}</span><i class="fas fa-minus"></i>
<span v-if="full">{{ i18n.ts.unfollow }}</span><i class="ph-minus"></i>
</template>
<template v-else>
<span v-if="full">{{ i18n.ts.follow }}</span><i class="fas fa-plus"></i>
<span v-if="full">{{ i18n.ts.follow }}</span><i class="ph-plus"></i>
</template>
</template>
<template v-else>
<span v-if="full">{{ i18n.ts.processing }}</span><i class="fas fa-spinner fa-pulse fa-fw"></i>
<span v-if="full">{{ i18n.ts.processing }}</span><i class="ph-circle-notch fa-pulse ph-fw"></i>
</template>
</button>
</template>

View file

@ -2,10 +2,10 @@
<MkA :to="`/channels/${channel.id}`" class="eftoefju _panel" tabindex="-1">
<div class="banner" :style="bannerStyle">
<div class="fade"></div>
<div class="name"><i class="fas fa-satellite-dish"></i> {{ channel.name }}</div>
<div class="name"><i class="ph-television"></i> {{ channel.name }}</div>
<div class="status">
<div>
<i class="fas fa-users fa-fw"></i>
<i class="ph-users ph-fw"></i>
<I18n :src="i18n.ts._channel.usersCount" tag="span" style="margin-left: 4px;">
<template #n>
<b>{{ channel.usersCount }}</b>
@ -13,7 +13,7 @@
</I18n>
</div>
<div>
<i class="fas fa-pencil-alt fa-fw"></i>
<i class="ph-pencil ph-fw"></i>
<I18n :src="i18n.ts._channel.notesCount" tag="span" style="margin-left: 4px;">
<template #n>
<b>{{ channel.notesCount }}</b>

View file

@ -5,8 +5,8 @@
<div class="sub">
<slot name="func"></slot>
<button v-if="foldable" class="_button" @click="() => showBody = !showBody">
<template v-if="showBody"><i class="fas fa-angle-up"></i></template>
<template v-else><i class="fas fa-angle-down"></i></template>
<template v-if="showBody"><i class="ph-caret-up"></i></template>
<template v-else><i class="ph-caret-down"></i></template>
</button>
</div>
</header>

View file

@ -64,14 +64,14 @@ export default defineComponent({
}, [
h('span', [
h('i', {
class: 'fas fa-angle-up icon',
class: 'ph-caret-up icon',
}),
getDateText(item.createdAt),
]),
h('span', [
getDateText(props.items[i + 1].createdAt),
h('i', {
class: 'fas fa-angle-down icon',
class: 'ph-caret-down icon',
}),
]),
]));

View file

@ -5,17 +5,17 @@
<i :class="icon"></i>
</div>
<div v-else-if="!input && !select" class="icon" :class="type">
<i v-if="type === 'success'" class="fas fa-check"></i>
<i v-else-if="type === 'error'" class="fas fa-times-circle"></i>
<i v-else-if="type === 'warning'" class="fas fa-exclamation-triangle"></i>
<i v-else-if="type === 'info'" class="fas fa-info-circle"></i>
<i v-else-if="type === 'question'" class="fas fa-question-circle"></i>
<i v-else-if="type === 'waiting'" class="fas fa-spinner fa-pulse"></i>
<i v-if="type === 'success'" class="ph-check"></i>
<i v-else-if="type === 'error'" class="ph-circle-wavy-warning"></i>
<i v-else-if="type === 'warning'" class="ph-warning"></i>
<i v-else-if="type === 'info'" class="ph-info"></i>
<i v-else-if="type === 'question'" class="ph-question"></i>
<i v-else-if="type === 'waiting'" class="ph-circle-notch fa-pulse"></i>
</div>
<header v-if="title"><Mfm :text="title"/></header>
<div v-if="text" class="body"><Mfm :text="text"/></div>
<MkInput v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder || undefined" @keydown="onInputKeydown">
<template v-if="input.type === 'password'" #prefix><i class="fas fa-lock"></i></template>
<template v-if="input.type === 'password'" #prefix><i class="ph-lock"></i></template>
</MkInput>
<MkSelect v-if="select" v-model="selectedValue" autofocus>
<template v-if="select.items">

View file

@ -63,30 +63,30 @@ const title = computed(() => `${props.file.name}\n${props.file.type} ${bytes(pro
function getMenu() {
return [{
text: i18n.ts.rename,
icon: 'fas fa-i-cursor',
icon: 'ph-cursor-text',
action: rename,
}, {
text: props.file.isSensitive ? i18n.ts.unmarkAsSensitive : i18n.ts.markAsSensitive,
icon: props.file.isSensitive ? 'fas fa-eye' : 'fas fa-eye-slash',
icon: props.file.isSensitive ? 'ph-eye' : 'ph-eye-slash',
action: toggleSensitive,
}, {
text: i18n.ts.describeFile,
icon: 'fas fa-i-cursor',
icon: 'ph-cursor-text',
action: describe,
}, null, {
text: i18n.ts.copyUrl,
icon: 'fas fa-link',
icon: 'ph-link-simple',
action: copyUrl,
}, {
type: 'a',
href: props.file.url,
target: '_blank',
text: i18n.ts.download,
icon: 'fas fa-download',
icon: 'ph-download-simple',
download: props.file.name,
}, null, {
text: i18n.ts.delete,
icon: 'fas fa-trash-alt',
icon: 'ph-trash',
danger: true,
action: deleteFile,
}];

View file

@ -16,8 +16,8 @@
@dragend="onDragend"
>
<p class="name">
<template v-if="hover"><i class="fas fa-folder-open fa-fw"></i></template>
<template v-if="!hover"><i class="fas fa-folder fa-fw"></i></template>
<template v-if="hover"><i class="ph-folder-notch-open ph-fw"></i></template>
<template v-if="!hover"><i class="ph-folder-notch ph-fw"></i></template>
{{ folder.name }}
</p>
<p v-if="defaultStore.state.uploadFolder == folder.id" class="upload">
@ -229,7 +229,7 @@ function setAsUploadFolder() {
function onContextmenu(ev: MouseEvent) {
os.contextMenu([{
text: i18n.ts.openInWindow,
icon: 'fas fa-window-restore',
icon: 'ph-copy',
action: () => {
os.popup(defineAsyncComponent(() => import('@/components/MkDriveWindow.vue')), {
initialFolder: props.folder,
@ -238,11 +238,11 @@ function onContextmenu(ev: MouseEvent) {
},
}, null, {
text: i18n.ts.rename,
icon: 'fas fa-i-cursor',
icon: 'ph-cursor-text',
action: rename,
}, null, {
text: i18n.ts.delete,
icon: 'fas fa-trash-alt',
icon: 'ph-trash',
danger: true,
action: deleteFolder,
}], ev);

View file

@ -7,7 +7,7 @@
@dragleave="onDragleave"
@drop.stop="onDrop"
>
<i v-if="folder == null" class="fas fa-cloud"></i>
<i v-if="folder == null" class="ph-cloud"></i>
<span>{{ folder == null ? i18n.ts.drive : folder.name }}</span>
</div>
</template>

View file

@ -11,7 +11,7 @@
@removeFolder="removeFolder"
/>
<template v-for="f in hierarchyFolders">
<span class="separator"><i class="fas fa-angle-right"></i></span>
<span class="separator"><i class="ph-caret-right"></i></span>
<XNavFolder
:folder="f"
:parent-folder="folder"
@ -21,10 +21,10 @@
@removeFolder="removeFolder"
/>
</template>
<span v-if="folder != null" class="separator"><i class="fas fa-angle-right"></i></span>
<span v-if="folder != null" class="separator"><i class="ph-caret-right"></i></span>
<span v-if="folder != null" class="folder current">{{ folder.name }}</span>
</div>
<button class="menu _button" @click="showMenu"><i class="fas fa-ellipsis-h"></i></button>
<button class="menu _button" @click="showMenu"><i class="ph-three-dots-outline"></i></button>
</nav>
<div
ref="main" class="main"
@ -573,26 +573,26 @@ function getMenu() {
type: 'label',
}, {
text: i18n.ts.upload,
icon: 'fas fa-upload',
icon: 'ph-upload-simple',
action: () => { selectLocalFile(); },
}, {
text: i18n.ts.fromUrl,
icon: 'fas fa-link',
icon: 'ph-link-simple',
action: () => { urlUpload(); },
}, null, {
text: folder.value ? folder.value.name : i18n.ts.drive,
type: 'label',
}, folder.value ? {
text: i18n.ts.renameFolder,
icon: 'fas fa-i-cursor',
icon: 'ph-cursor-text',
action: () => { renameFolder(folder.value); },
} : undefined, folder.value ? {
text: i18n.ts.deleteFolder,
icon: 'fas fa-trash-alt',
icon: 'ph-trash',
action: () => { deleteFolder(folder.value as Misskey.entities.DriveFolder); },
} : undefined, {
text: i18n.ts.createFolder,
icon: 'fas fa-folder-plus',
icon: 'ph-folder-notch-plus',
action: () => { createFolder(); },
}];
}

View file

@ -1,22 +1,22 @@
<template>
<div ref="thumbnail" class="zdjebgpv">
<ImgWithBlurhash v-if="isThumbnailAvailable" :hash="file.blurhash" :src="file.thumbnailUrl" :alt="file.name" :title="file.name" :cover="fit !== 'contain'"/>
<i v-else-if="is === 'image'" class="fas fa-file-image icon"></i>
<i v-else-if="is === 'video'" class="fas fa-file-video icon"></i>
<i v-else-if="is === 'audio' || is === 'midi'" class="fas fa-music icon"></i>
<i v-else-if="is === 'csv'" class="fas fa-file-csv icon"></i>
<i v-else-if="is === 'pdf'" class="fas fa-file-pdf icon"></i>
<i v-else-if="is === 'textfile'" class="fas fa-file-alt icon"></i>
<i v-else-if="is === 'archive'" class="fas fa-file-archive icon"></i>
<i v-else class="fas fa-file icon"></i>
<i v-else-if="is === 'image'" class="ph-file-image icon"></i>
<i v-else-if="is === 'video'" class="ph-file-video icon"></i>
<i v-else-if="is === 'audio' || is === 'midi'" class="ph-file-audio icon"></i>
<i v-else-if="is === 'csv'" class="ph-file-csv icon"></i>
<i v-else-if="is === 'pdf'" class="ph-file-pdf icon"></i>
<i v-else-if="is === 'textfile'" class="ph-file-text icon"></i>
<i v-else-if="is === 'archive'" class="ph-file-zip icon"></i>
<i v-else class="ph-file icon"></i>
<i v-if="isThumbnailAvailable && is === 'video'" class="fas fa-film icon-sub"></i>
<i v-if="isThumbnailAvailable && is === 'video'" class="ph-file-video icon-sub"></i>
</div>
</template>
<script lang="ts" setup>
import { computed } from 'vue';
import * as Misskey from 'misskey-js';
import type * as Misskey from 'misskey-js';
import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
const props = defineProps<{

View file

@ -2,7 +2,7 @@
<!-- このコンポーネントの要素のclassは親から利用されるのでむやみに弄らないこと -->
<section>
<header class="_acrylic" @click="shown = !shown">
<i class="toggle fa-fw" :class="shown ? 'fas fa-chevron-down' : 'fas fa-chevron-up'"></i> <slot></slot> ({{ emojis.length }})
<i class="toggle ph-fw" :class="shown ? 'ph-caret-down' : 'ph-caret-up'"></i> <slot></slot> ({{ emojis.length }})
</header>
<div v-if="shown" class="body">
<button

View file

@ -46,7 +46,7 @@
</section>
<section>
<header><i class="far fa-clock fa-fw"></i> {{ i18n.ts.recentUsed }}</header>
<header><i class="far fa-clock ph-fw"></i> {{ i18n.ts.recentUsed }}</header>
<div class="body">
<button
v-for="emoji in recentlyUsedEmojis"
@ -69,10 +69,10 @@
</div>
</div>
<div class="tabs">
<button class="_button tab" :class="{ active: tab === 'index' }" @click="tab = 'index'"><i class="fas fa-asterisk fa-fw"></i></button>
<button class="_button tab" :class="{ active: tab === 'custom' }" @click="tab = 'custom'"><i class="fas fa-laugh fa-fw"></i></button>
<button class="_button tab" :class="{ active: tab === 'unicode' }" @click="tab = 'unicode'"><i class="fas fa-leaf fa-fw"></i></button>
<button class="_button tab" :class="{ active: tab === 'tags' }" @click="tab = 'tags'"><i class="fas fa-hashtag fa-fw"></i></button>
<button class="_button tab" :class="{ active: tab === 'index' }" @click="tab = 'index'"><i class="ph-asterisk ph-fw"></i></button>
<button class="_button tab" :class="{ active: tab === 'custom' }" @click="tab = 'custom'"><i class="ph-smiley-wink ph-fw"></i></button>
<button class="_button tab" :class="{ active: tab === 'unicode' }" @click="tab = 'unicode'"><i class="ph-leaf ph-fw"></i></button>
<button class="_button tab" :class="{ active: tab === 'tags' }" @click="tab = 'tags'"><i class="ph-hash ph-fw"></i></button>
</div>
</div>
</template>

View file

@ -1,6 +1,6 @@
<template>
<span class="mk-file-type-icon">
<template v-if="kind == 'image'"><i class="fas fa-file-image"></i></template>
<template v-if="kind == 'image'"><i class="ph-file-image"></i></template>
</span>
</template>

View file

@ -4,8 +4,8 @@
<div class="title"><slot name="header"></slot></div>
<div class="divider"></div>
<button class="_button">
<template v-if="showBody"><i class="fas fa-angle-up"></i></template>
<template v-else><i class="fas fa-angle-down"></i></template>
<template v-if="showBody"><i class="ph-caret-up"></i></template>
<template v-else><i class="ph-caret-down"></i></template>
</button>
</header>
<transition :name="$store.state.animation ? 'folder-toggle' : ''"

View file

@ -6,23 +6,23 @@
>
<template v-if="!wait">
<template v-if="hasPendingFollowRequestFromYou && user.isLocked">
<span v-if="full">{{ i18n.ts.followRequestPending }}</span><i class="fas fa-hourglass-half"></i>
<span v-if="full">{{ i18n.ts.followRequestPending }}</span><i class="ph-hourglass-medium"></i>
</template>
<template v-else-if="hasPendingFollowRequestFromYou && !user.isLocked"> <!-- つまりリモートフォローの場合 -->
<span v-if="full">{{ i18n.ts.processing }}</span><i class="fas fa-spinner fa-pulse"></i>
<span v-if="full">{{ i18n.ts.processing }}</span><i class="ph-circle-notch fa-pulse"></i>
</template>
<template v-else-if="isFollowing">
<span v-if="full">{{ i18n.ts.unfollow }}</span><i class="fas fa-minus"></i>
<span v-if="full">{{ i18n.ts.unfollow }}</span><i class="ph-minus"></i>
</template>
<template v-else-if="!isFollowing && user.isLocked">
<span v-if="full">{{ i18n.ts.followRequest }}</span><i class="fas fa-plus"></i>
<span v-if="full">{{ i18n.ts.followRequest }}</span><i class="ph-plus"></i>
</template>
<template v-else-if="!isFollowing && !user.isLocked">
<span v-if="full">{{ i18n.ts.follow }}</span><i class="fas fa-plus"></i>
<span v-if="full">{{ i18n.ts.follow }}</span><i class="ph-plus"></i>
</template>
</template>
<template v-else>
<span v-if="full">{{ i18n.ts.processing }}</span><i class="fas fa-spinner fa-pulse fa-fw"></i>
<span v-if="full">{{ i18n.ts.processing }}</span><i class="ph-circle-notch fa-pulse ph-fw"></i>
</template>
</button>
</template>

View file

@ -1,7 +1,7 @@
<template>
<div class="mk-google">
<input v-model="query" type="search" :placeholder="q">
<button @click="search"><i class="fas fa-search"></i> {{ $ts.searchByGoogle }}</button>
<button @click="search"><i class="ph-magnifying-glass"></i> {{ $ts.searchByGoogle }}</button>
</div>
</template>

View file

@ -1,7 +1,7 @@
<template>
<div class="fpezltsf" :class="{ warn }">
<i v-if="warn" class="fas fa-exclamation-triangle"></i>
<i v-else class="fas fa-info-circle"></i>
<i v-if="warn" class="ph-warning"></i>
<i v-else class="ph-info"></i>
<slot></slot>
</div>
</template>

View file

@ -6,12 +6,12 @@
<button v-if="item.action" v-click-anime class="_button" @click="$event => { item.action($event); close(); }">
<i class="icon" :class="item.icon"></i>
<div class="text">{{ item.text }}</div>
<span v-if="item.indicate" class="indicator"><i class="fas fa-circle"></i></span>
<span v-if="item.indicate" class="indicator"><i class="ph-circle"></i></span>
</button>
<MkA v-else v-click-anime :to="item.to" @click.passive="close()">
<i class="icon" :class="item.icon"></i>
<div class="text">{{ item.text }}</div>
<span v-if="item.indicate" class="indicator"><i class="fas fa-circle"></i></span>
<span v-if="item.indicate" class="indicator"><i class="ph-circle"></i></span>
</MkA>
</template>
</div>

View file

@ -3,7 +3,7 @@
:title="url"
>
<slot></slot>
<i v-if="target === '_blank'" class="fas fa-external-link-square-alt icon"></i>
<i v-if="target === '_blank'" class="ph-arrow-square-out icon"></i>
</component>
</template>

View file

@ -1,7 +1,7 @@
<template>
<div class="mk-media-banner">
<div v-if="media.isSensitive && hide" class="sensitive" @click="hide = false">
<span class="icon"><i class="fas fa-exclamation-triangle"></i></span>
<span class="icon"><i class="ph-warning"></i></span>
<b>{{ $ts.sensitive }}</b>
<span>{{ $ts.clickToShow }}</span>
</div>
@ -37,7 +37,7 @@
:title="media.name"
:download="media.name"
>
<span class="icon"><i class="fas fa-download"></i></span>
<span class="icon"><i class="ph-download-simple"></i></span>
<b>{{ media.name }}</b>
</a>
</div>

View file

@ -3,7 +3,7 @@
<ImgWithBlurhash class="bg" :hash="image.blurhash" :title="image.comment" :alt="image.comment"/>
<div class="text">
<div class="wrapper">
<b style="display: block;"><i class="fas fa-exclamation-triangle"></i> {{ $ts.sensitive }}</b>
<b style="display: block;"><i class="ph-warning"></i> {{ $ts.sensitive }}</b>
<span style="display: block;">{{ $ts.clickToShow }}</span>
</div>
</div>
@ -16,7 +16,7 @@
<ImgWithBlurhash :hash="image.blurhash" :src="url" :alt="image.comment" :title="image.comment" :cover="false"/>
<div v-if="image.type === 'image/gif'" class="gif">GIF</div>
</a>
<button v-tooltip="$ts.hide" class="_button hide" @click="hide = true"><i class="fas fa-eye-slash"></i></button>
<button v-tooltip="$ts.hide" class="_button hide" @click="hide = true"><i class="ph-eye-slash"></i></button>
</div>
</template>

View file

@ -1,7 +1,7 @@
<template>
<div v-if="hide" class="icozogqfvdetwohsdglrbswgrejoxbdj" @click="hide = false">
<div>
<b><i class="fas fa-exclamation-triangle"></i> {{ $ts.sensitive }}</b>
<b><i class="ph-warning"></i> {{ $ts.sensitive }}</b>
<span>{{ $ts.clickToShow }}</span>
</div>
</div>
@ -36,7 +36,7 @@
>
</video>
</VuePlyr>
<i class="fas fa-eye-slash" @click="hide = true"></i>
<i class="ph-eye-slash" @click="hide = true"></i>
</div>
</template>

View file

@ -16,33 +16,33 @@
<span><MkEllipsis/></span>
</span>
<MkA v-else-if="item.type === 'link'" :to="item.to" :tabindex="i" class="_button item" @click.passive="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
<i v-if="item.icon" class="fa-fw" :class="item.icon"></i>
<i v-if="item.icon" class="ph-fw" :class="item.icon"></i>
<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
<span>{{ item.text }}</span>
<span v-if="item.indicate" class="indicator"><i class="fas fa-circle"></i></span>
<span v-if="item.indicate" class="indicator"><i class="ph-circle"></i></span>
</MkA>
<a v-else-if="item.type === 'a'" :href="item.href" :target="item.target" :download="item.download" :tabindex="i" class="_button item" @click="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
<i v-if="item.icon" class="fa-fw" :class="item.icon"></i>
<i v-if="item.icon" class="ph-fw" :class="item.icon"></i>
<span>{{ item.text }}</span>
<span v-if="item.indicate" class="indicator"><i class="fas fa-circle"></i></span>
<span v-if="item.indicate" class="indicator"><i class="ph-circle"></i></span>
</a>
<button v-else-if="item.type === 'user'" :tabindex="i" class="_button item" :class="{ active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
<MkAvatar :user="item.user" class="avatar"/><MkUserName :user="item.user"/>
<span v-if="item.indicate" class="indicator"><i class="fas fa-circle"></i></span>
<span v-if="item.indicate" class="indicator"><i class="ph-circle"></i></span>
</button>
<span v-else-if="item.type === 'switch'" :tabindex="i" class="item" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
<FormSwitch v-model="item.ref" :disabled="item.disabled" class="form-switch">{{ item.text }}</FormSwitch>
</span>
<button v-else-if="item.type === 'parent'" :tabindex="i" class="_button item parent" :class="{ childShowing: childShowingItem === item }" @mouseenter="showChildren(item, $event)">
<i v-if="item.icon" class="fa-fw" :class="item.icon"></i>
<i v-if="item.icon" class="ph-fw" :class="item.icon"></i>
<span>{{ item.text }}</span>
<span class="caret"><i class="fas fa-caret-right fa-fw"></i></span>
<span class="caret"><i class="ph-caret-right ph-fw"></i></span>
</button>
<button v-else :tabindex="i" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
<i v-if="item.icon" class="fa-fw" :class="item.icon"></i>
<i v-if="item.icon" class="ph-fw" :class="item.icon"></i>
<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
<span>{{ item.text }}</span>
<span v-if="item.indicate" class="indicator"><i class="fas fa-circle"></i></span>
<span v-if="item.indicate" class="indicator"><i class="ph-circle"></i></span>
</button>
</template>
<span v-if="items2.length === 0" class="none item">

View file

@ -2,13 +2,13 @@
<MkModal ref="modal" @click="$emit('click')" @closed="$emit('closed')">
<div ref="rootEl" class="hrmcaedk _narrow_" :style="{ width: `${width}px`, height: (height ? `min(${height}px, 100%)` : '100%') }">
<div class="header" @contextmenu="onContextmenu">
<button v-if="history.length > 0" v-tooltip="$ts.goBack" class="_button" @click="back()"><i class="fas fa-arrow-left"></i></button>
<button v-if="history.length > 0" v-tooltip="$ts.goBack" class="_button" @click="back()"><i class="ph--left"></i></button>
<span v-else style="display: inline-block; width: 20px"></span>
<span v-if="pageMetadata?.value" class="title">
<i v-if="pageMetadata?.value.icon" class="icon" :class="pageMetadata?.value.icon"></i>
<span>{{ pageMetadata?.value.title }}</span>
</span>
<button class="_button" @click="$refs.modal.close()"><i class="fas fa-times"></i></button>
<button class="_button" @click="$refs.modal.close()"><i class="ph-x"></i></button>
</div>
<div class="body">
<MkStickyContainer>
@ -68,22 +68,22 @@ const contextmenu = $computed(() => {
type: 'label',
text: path,
}, {
icon: 'fas fa-expand-alt',
icon: 'ph-arrows-out-simple',
text: i18n.ts.showInPage,
action: expand,
}, {
icon: 'fas fa-external-link-alt',
icon: 'ph-arrow-square-out',
text: i18n.ts.popout,
action: popout,
}, null, {
icon: 'fas fa-external-link-alt',
icon: 'ph-arrow-square-out',
text: i18n.ts.openInNewTab,
action: () => {
window.open(pageUrl, '_blank');
modal.close();
},
}, {
icon: 'fas fa-link',
icon: 'ph-link-simple',
text: i18n.ts.copyLink,
action: () => {
copyToClipboard(pageUrl);

View file

@ -2,12 +2,12 @@
<MkModal ref="modal" :prefer-type="'dialog'" @click="onBgClick" @closed="$emit('closed')">
<div ref="rootEl" class="ebkgoccj _narrow_" :style="{ width: `${width}px`, height: scroll ? (height ? `${height}px` : null) : (height ? `min(${height}px, 100%)` : '100%') }" @keydown="onKeydown">
<div ref="headerEl" class="header">
<button v-if="withOkButton" class="_button" @click="$emit('close')"><i class="fas fa-times"></i></button>
<button v-if="withOkButton" class="_button" @click="$emit('close')"><i class="ph-x"></i></button>
<span class="title">
<slot name="header"></slot>
</span>
<button v-if="!withOkButton" class="_button" @click="$emit('close')"><i class="fas fa-times"></i></button>
<button v-if="withOkButton" class="_button" :disabled="okButtonDisabled" @click="$emit('ok')"><i class="fas fa-check"></i></button>
<button v-if="!withOkButton" class="_button" @click="$emit('close')"><i class="ph-x"></i></button>
<button v-if="withOkButton" class="_button" :disabled="okButtonDisabled" @click="$emit('ok')"><i class="ph-check"></i></button>
</div>
<div class="body">
<slot :width="bodyWidth" :height="bodyHeight"></slot>

View file

@ -10,12 +10,12 @@
:class="{ renote: isRenote }"
>
<MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" class="reply-to"/>
<div v-if="pinned" class="info"><i class="fas fa-thumbtack"></i> {{ i18n.ts.pinnedNote }}</div>
<div v-if="appearNote._prId_" class="info"><i class="fas fa-bullhorn"></i> {{ i18n.ts.promotion }}<button class="_textButton hide" @click="readPromo()">{{ i18n.ts.hideThisNote }} <i class="fas fa-times"></i></button></div>
<div v-if="appearNote._featuredId_" class="info"><i class="fas fa-bolt"></i> {{ i18n.ts.featured }}</div>
<div v-if="pinned" class="info"><i class="ph-push-pin"></i> {{ i18n.ts.pinnedNote }}</div>
<div v-if="appearNote._prId_" class="info"><i class="ph-megaphone-simple"></i> {{ i18n.ts.promotion }}<button class="_textButton hide" @click="readPromo()">{{ i18n.ts.hideThisNote }} <i class="ph-x"></i></button></div>
<div v-if="appearNote._featuredId_" class="info"><i class="ph-lightning"></i> {{ i18n.ts.featured }}</div>
<div v-if="isRenote" class="renote">
<MkAvatar class="avatar" :user="note.user"/>
<i class="fas fa-retweet"></i>
<i class="ph-repeat"></i>
<I18n :src="i18n.ts.renotedBy" tag="span">
<template #user>
<MkA v-user-preview="note.userId" class="name" :to="userPage(note.user)">
@ -25,7 +25,7 @@
</I18n>
<div class="info">
<button ref="renoteTime" class="_button time" @click="showRenoteMenu()">
<i v-if="isMyRenote" class="fas fa-ellipsis-h dropdownIcon"></i>
<i v-if="isMyRenote" class="ph-three-dots-outline dropdownIcon"></i>
<MkTime :time="note.createdAt"/>
</button>
<MkVisibility :note="note"/>
@ -43,7 +43,7 @@
</p>
<div v-show="appearNote.cw == null || showContent" class="content" :class="{ collapsed, isLong }">
<div class="text" @click.self="router.push(notePage(appearNote))">
<MkA v-if="appearNote.replyId" class="reply" :to="`/notes/${appearNote.replyId}`"><i class="fas fa-reply"></i></MkA>
<MkA v-if="appearNote.replyId" class="reply" :to="`/notes/${appearNote.replyId}`"><i class="ph-arrow-bend-up-left"></i></MkA>
<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
<a v-if="appearNote.renote != null" class="rp">RN:</a>
<div v-if="translating || translation" class="translation">
@ -67,26 +67,26 @@
<span>{{ i18n.ts.showLess }}</span>
</button>
</div>
<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="fas fa-satellite-dish"></i> {{ appearNote.channel.name }}</MkA>
<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="ph-television"></i> {{ appearNote.channel.name }}</MkA>
</div>
<footer class="footer">
<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
<button class="button _button" @click="reply()">
<template v-if="appearNote.reply"><i class="fas fa-reply-all"></i></template>
<template v-else><i class="fas fa-reply"></i></template>
<template v-if="appearNote.reply"><i class="ph-arrow-bend-double-left"></i></template>
<template v-else><i class="ph-arrow-bend-up-left"></i></template>
<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p>
</button>
<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
<button v-if="appearNote.myReaction == null" ref="reactButton" class="button _button" @click="react()">
<i class="fas fa-face-laugh"></i>
<i class="ph-smiley-wink"></i>
</button>
<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
<i class="fas fa-minus"></i>
<i class="ph-minus"></i>
</button>
<XQuoteButton class="button" :note="appearNote"/>
<button ref="menuButton" class="button _button" @click="menu()">
<i class="fas fa-ellipsis-h"></i>
<i class="ph-three-dots-outline"></i>
</button>
</footer>
</div>
@ -263,7 +263,7 @@ function showRenoteMenu(viaKeyboard = false): void {
if (!isMyRenote) return;
os.popupMenu([{
text: i18n.ts.unrenote,
icon: 'fas fa-trash-alt',
icon: 'ph-trash',
danger: true,
action: () => {
os.api('notes/delete', {

View file

@ -13,7 +13,7 @@
<MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" class="reply-to" @click.self="router.push(notePage(appearNote))"/>
<div v-if="isRenote" class="renote">
<MkAvatar class="avatar" :user="note.user"/>
<i class="fas fa-retweet"></i>
<i class="ph-repeat"></i>
<I18n :src="i18n.ts.renotedBy" tag="span">
<template #user>
<MkA v-user-preview="note.userId" class="name" :to="userPage(note.user)">
@ -23,7 +23,7 @@
</I18n>
<div class="info">
<button ref="renoteTime" class="_button time" @click="showRenoteMenu()">
<i v-if="isMyRenote" class="fas fa-ellipsis-h dropdownIcon"></i>
<i v-if="isMyRenote" class="ph-three-dots-outline dropdownIcon"></i>
<MkTime :time="note.createdAt"/>
</button>
<MkVisibility :note="note"/>
@ -54,7 +54,7 @@
</p>
<div v-show="appearNote.cw == null || showContent" class="content">
<div class="text" @click.self="router.push(notePage(appearNote))">
<MkA v-if="appearNote.replyId" class="reply" :to="`/notes/${appearNote.replyId}`"><i class="fas fa-reply"></i></MkA>
<MkA v-if="appearNote.replyId" class="reply" :to="`/notes/${appearNote.replyId}`"><i class="ph-arrow-bend-up-left"></i></MkA>
<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
<a v-if="appearNote.renote != null" class="rp">RN:</a>
<div v-if="translating || translation" class="translation">
@ -72,7 +72,7 @@
<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="true" class="url-preview"/>
<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote"/></div>
</div>
<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="fas fa-satellite-dish"></i> {{ appearNote.channel.name }}</MkA>
<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="ph-television"></i> {{ appearNote.channel.name }}</MkA>
</div>
<footer class="footer">
<div class="info">
@ -82,21 +82,21 @@
</div>
<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
<button class="button _button" @click="reply()">
<template v-if="appearNote.reply"><i class="fas fa-reply-all"></i></template>
<template v-else><i class="fas fa-reply"></i></template>
<template v-if="appearNote.reply"><i class="ph-arrow-bend-double-left"></i></template>
<template v-else><i class="ph-arrow-bend-up-left"></i></template>
<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p>
</button>
<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
<button v-if="appearNote.myReaction == null" ref="reactButton" class="button _button" @click="react()">
<i class="fas fa-face-laugh"></i>
<i class="ph-smiley-wink"></i>
</button>
<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
<i class="fas fa-minus"></i>
<i class="ph-minus"></i>
</button>
<XQuoteButton class="button" :note="appearNote"/>
<button ref="menuButton" class="button _button" @click="menu()">
<i class="fas fa-ellipsis-h"></i>
<i class="ph-three-dots-outline"></i>
</button>
</footer>
</div>
@ -266,7 +266,7 @@ function showRenoteMenu(viaKeyboard = false): void {
if (!isMyRenote) return;
os.popupMenu([{
text: i18n.ts.unrenote,
icon: 'fas fa-trash-alt',
icon: 'ph-trash',
danger: true,
action: () => {
os.api('notes/delete', {

View file

@ -20,7 +20,7 @@
<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply" :conversation="conversation" :depth="depth + 1"/>
</template>
<div v-else-if="replies.length > 0" class="more">
<MkA class="text _link" :to="notePage(note)">{{ i18n.ts.continueThread }} <i class="fas fa-angle-double-right"></i></MkA>
<MkA class="text _link" :to="notePage(note)">{{ i18n.ts.continueThread }} <i class="ph-caret-double-right"></i></MkA>
</div>
</template>
</div>

View file

@ -5,16 +5,16 @@
<MkAvatar v-else-if="notification.user" class="icon" :user="notification.user"/>
<img v-else-if="notification.icon" class="icon" :src="notification.icon" alt=""/>
<div class="sub-icon" :class="notification.type">
<i v-if="notification.type === 'follow'" class="fas fa-plus"></i>
<i v-else-if="notification.type === 'receiveFollowRequest'" class="fas fa-clock"></i>
<i v-else-if="notification.type === 'followRequestAccepted'" class="fas fa-check"></i>
<i v-else-if="notification.type === 'groupInvited'" class="fas fa-id-card-alt"></i>
<i v-else-if="notification.type === 'renote'" class="fas fa-retweet"></i>
<i v-else-if="notification.type === 'reply'" class="fas fa-reply"></i>
<i v-else-if="notification.type === 'mention'" class="fas fa-at"></i>
<i v-else-if="notification.type === 'quote'" class="fas fa-quote-left"></i>
<i v-else-if="notification.type === 'pollVote'" class="fas fa-poll-h"></i>
<i v-else-if="notification.type === 'pollEnded'" class="fas fa-poll-h"></i>
<i v-if="notification.type === 'follow'" class="ph-plus"></i>
<i v-else-if="notification.type === 'receiveFollowRequest'" class="ph-clock"></i>
<i v-else-if="notification.type === 'followRequestAccepted'" class="ph-check"></i>
<i v-else-if="notification.type === 'groupInvited'" class="ph-identification-card"></i>
<i v-else-if="notification.type === 'renote'" class="ph-repeat"></i>
<i v-else-if="notification.type === 'reply'" class="ph-arrow-bend-up-left"></i>
<i v-else-if="notification.type === 'mention'" class="ph-at"></i>
<i v-else-if="notification.type === 'quote'" class="ph-quotes"></i>
<i v-else-if="notification.type === 'pollVote'" class="ph-microphone-stage"></i>
<i v-else-if="notification.type === 'pollEnded'" class="ph-microphone-stage"></i>
<!-- notification.reaction null になることはまずないがここでoptional chaining使うと一部ブラウザで刺さるので念の為 -->
<XReactionIcon
v-else-if="notification.type === 'reaction'"
@ -33,14 +33,14 @@
<MkTime v-if="withTime" :time="notification.createdAt" class="time"/>
</header>
<MkA v-if="notification.type === 'reaction'" class="text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
<i class="fas fa-quote-left"></i>
<i class="ph-quotes"></i>
<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/>
<i class="fas fa-quote-right"></i>
<i class="ph-quotes"></i>
</MkA>
<MkA v-if="notification.type === 'renote'" class="text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note.renote)">
<i class="fas fa-quote-left"></i>
<i class="ph-quotes"></i>
<Mfm :text="getNoteSummary(notification.note.renote)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.renote.emojis"/>
<i class="fas fa-quote-right"></i>
<i class="ph-quotes"></i>
</MkA>
<MkA v-if="notification.type === 'reply'" class="text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/>
@ -52,14 +52,14 @@
<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/>
</MkA>
<MkA v-if="notification.type === 'pollVote'" class="text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
<i class="fas fa-quote-left"></i>
<i class="ph-quotes"></i>
<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/>
<i class="fas fa-quote-right"></i>
<i class="ph-quotes"></i>
</MkA>
<MkA v-if="notification.type === 'pollEnded'" class="text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
<i class="fas fa-quote-left"></i>
<i class="ph-quotes"></i>
<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/>
<i class="fas fa-quote-right"></i>
<i class="ph-quotes"></i>
</MkA>
<span v-if="notification.type === 'follow'" class="text" style="opacity: 0.6;">{{ i18n.ts.youGotNewFollower }}<div v-if="full"><MkFollowButton :user="notification.user" :full="true"/></div></span>
<span v-if="notification.type === 'followRequestAccepted'" class="text" style="opacity: 0.6;">{{ i18n.ts.followRequestAccepted }}</span>

View file

@ -57,7 +57,7 @@ const buttonsLeft = $computed(() => {
if (history.length > 1) {
buttons.push({
icon: 'fas fa-arrow-left',
icon: 'ph--left',
onClick: back,
});
}
@ -66,7 +66,7 @@ const buttonsLeft = $computed(() => {
});
const buttonsRight = $computed(() => {
const buttons = [{
icon: 'fas fa-expand-alt',
icon: 'ph-arrows-out-simple',
title: i18n.ts.showInPage,
onClick: expand,
}];
@ -86,22 +86,22 @@ provide('shouldOmitHeaderTitle', true);
provide('shouldHeaderThin', true);
const contextmenu = $computed(() => ([{
icon: 'fas fa-expand-alt',
icon: 'ph-arrows-out-simple',
text: i18n.ts.showInPage,
action: expand,
}, {
icon: 'fas fa-external-link-alt',
icon: 'ph-arrow-square-out',
text: i18n.ts.popout,
action: popout,
}, {
icon: 'fas fa-external-link-alt',
icon: 'ph-arrow-square-out',
text: i18n.ts.openInNewTab,
action: () => {
window.open(url + router.getCurrentPath(), '_blank');
windowEl.close();
},
}, {
icon: 'fas fa-link',
icon: 'ph-link-simple',
text: i18n.ts.copyLink,
action: () => {
copyToClipboard(url + router.getCurrentPath());

View file

@ -4,7 +4,7 @@
<li v-for="(choice, i) in note.poll.choices" :key="i" :class="{ voted: choice.voted }" @click="vote(i)">
<div class="backdrop" :style="{ 'width': `${showResult ? (choice.votes / total * 100) : 0}%` }"></div>
<span>
<template v-if="choice.isVoted"><i class="fas fa-check"></i></template>
<template v-if="choice.isVoted"><i class="ph-check"></i></template>
<Mfm :text="choice.text" :plain="true" :custom-emojis="note.emojis"/>
<span v-if="showResult" class="votes">({{ $t('_poll.votesCount', { n: choice.votes }) }})</span>
</span>

View file

@ -1,14 +1,14 @@
<template>
<div class="zmdxowus">
<p v-if="choices.length < 2" class="caution">
<i class="fas fa-exclamation-triangle"></i>{{ i18n.ts._poll.noOnlyOneChoice }}
<i class="ph-warning"></i>{{ i18n.ts._poll.noOnlyOneChoice }}
</p>
<ul>
<li v-for="(choice, i) in choices" :key="i">
<MkInput class="input" small :model-value="choice" :placeholder="$t('_poll.choiceN', { n: i + 1 })" @update:modelValue="onInput(i, $event)">
</MkInput>
<button class="_button" @click="remove(i)">
<i class="fas fa-times"></i>
<i class="ph-x"></i>
</button>
</li>
</ul>

View file

@ -8,35 +8,35 @@
@drop.stop="onDrop"
>
<header>
<button v-if="!fixed" class="cancel _button" @click="cancel"><i class="fas fa-times"></i></button>
<button v-if="!fixed" class="cancel _button" @click="cancel"><i class="ph-x"></i></button>
<button v-click-anime v-tooltip="i18n.ts.switchAccount" class="account _button" @click="openAccountMenu">
<MkAvatar :user="postAccount ?? $i" class="avatar"/>
</button>
<div class="right">
<span class="text-count" :class="{ over: textLength > maxTextLength }">{{ maxTextLength - textLength }}</span>
<span v-if="localOnly" class="local-only"><i class="fas fa-biohazard"></i></span>
<span v-if="localOnly" class="local-only"><i class="ph-hand-fist"></i></span>
<button ref="visibilityButton" v-tooltip="i18n.ts.visibility" class="_button visibility" :disabled="channel != null" @click="setVisibility">
<span v-if="visibility === 'public'"><i class="fas fa-globe"></i></span>
<span v-if="visibility === 'home'"><i class="fas fa-home"></i></span>
<span v-if="visibility === 'followers'"><i class="fas fa-unlock"></i></span>
<span v-if="visibility === 'specified'"><i class="fas fa-envelope"></i></span>
<span v-if="visibility === 'public'"><i class="ph-planet"></i></span>
<span v-if="visibility === 'home'"><i class="ph-house"></i></span>
<span v-if="visibility === 'followers'"><i class="ph-lock-simple-open"></i></span>
<span v-if="visibility === 'specified'"><i class="ph-envelope-simple-open"></i></span>
</button>
<button v-tooltip="i18n.ts.previewNoteText" class="_button preview" :class="{ active: showPreview }" @click="showPreview = !showPreview"><i class="fas fa-file-code"></i></button>
<button class="submit _buttonGradate" :disabled="!canPost" data-cy-open-post-form-submit @click="post">{{ submitText }}<i :class="reply ? 'fas fa-reply' : renote ? 'fas fa-quote-right' : 'fas fa-paper-plane'"></i></button>
<button v-tooltip="i18n.ts.previewNoteText" class="_button preview" :class="{ active: showPreview }" @click="showPreview = !showPreview"><i class="ph-file-code"></i></button>
<button class="submit _buttonGradate" :disabled="!canPost" data-cy-open-post-form-submit @click="post">{{ submitText }}<i :class="reply ? 'ph-arrow-bend-up-left' : renote ? 'ph-quotes' : 'ph-paper-plane-tilt'"></i></button>
</div>
</header>
<div class="form" :class="{ fixed }">
<XNoteSimple v-if="reply" class="preview" :note="reply"/>
<XNoteSimple v-if="renote" class="preview" :note="renote"/>
<div v-if="quoteId" class="with-quote"><i class="fas fa-quote-left"></i> {{ i18n.ts.quoteAttached }}<button @click="quoteId = null"><i class="fas fa-times"></i></button></div>
<div v-if="quoteId" class="with-quote"><i class="ph-quotes"></i> {{ i18n.ts.quoteAttached }}<button @click="quoteId = null"><i class="ph-x"></i></button></div>
<div v-if="visibility === 'specified'" class="to-specified">
<span style="margin-right: 8px;">{{ i18n.ts.recipient }}</span>
<div class="visibleUsers">
<span v-for="u in visibleUsers" :key="u.id">
<MkAcct :user="u"/>
<button class="_button" @click="removeVisibleUser(u)"><i class="fas fa-times"></i></button>
<button class="_button" @click="removeVisibleUser(u)"><i class="ph-x"></i></button>
</span>
<button class="_buttonPrimary" @click="addVisibleUser"><i class="fas fa-plus fa-fw"></i></button>
<button class="_buttonPrimary" @click="addVisibleUser"><i class="ph-plus ph-fw"></i></button>
</div>
</div>
<MkInfo v-if="hasNotSpecifiedMentions" warn class="hasNotSpecifiedMentions">{{ i18n.ts.notSpecifiedMentionWarning }} - <button class="_textButton" @click="addMissingMention()">{{ i18n.ts.add }}</button></MkInfo>
@ -47,13 +47,13 @@
<XPollEditor v-if="poll" v-model="poll" @destroyed="poll = null"/>
<XNotePreview v-if="showPreview" class="preview" :text="text"/>
<footer>
<button v-tooltip="i18n.ts.attachFile" class="_button" @click="chooseFileFrom"><i class="fas fa-photo-video"></i></button>
<button v-tooltip="i18n.ts.poll" class="_button" :class="{ active: poll }" @click="togglePoll"><i class="fas fa-poll-h"></i></button>
<button v-tooltip="i18n.ts.useCw" class="_button" :class="{ active: useCw }" @click="useCw = !useCw"><i class="fas fa-eye-slash"></i></button>
<button v-tooltip="i18n.ts.mention" class="_button" @click="insertMention"><i class="fas fa-at"></i></button>
<button v-tooltip="i18n.ts.hashtags" class="_button" :class="{ active: withHashtags }" @click="withHashtags = !withHashtags"><i class="fas fa-hashtag"></i></button>
<button v-tooltip="i18n.ts.emoji" class="_button" @click="insertEmoji"><i class="fas fa-laugh-squint"></i></button>
<button v-if="postFormActions.length > 0" v-tooltip="i18n.ts.plugin" class="_button" @click="showActions"><i class="fas fa-plug"></i></button>
<button v-tooltip="i18n.ts.attachFile" class="_button" @click="chooseFileFrom"><i class="ph-upload"></i></button>
<button v-tooltip="i18n.ts.poll" class="_button" :class="{ active: poll }" @click="togglePoll"><i class="ph-microphone-stage"></i></button>
<button v-tooltip="i18n.ts.useCw" class="_button" :class="{ active: useCw }" @click="useCw = !useCw"><i class="ph-eye-slash"></i></button>
<button v-tooltip="i18n.ts.mention" class="_button" @click="insertMention"><i class="ph-at"></i></button>
<button v-tooltip="i18n.ts.hashtags" class="_button" :class="{ active: withHashtags }" @click="withHashtags = !withHashtags"><i class="ph-hash"></i></button>
<button v-tooltip="i18n.ts.emoji" class="_button" @click="insertEmoji"><i class="ph-smiley-wink"></i></button>
<button v-if="postFormActions.length > 0" v-tooltip="i18n.ts.plugin" class="_button" @click="showActions"><i class="ph-plug"></i></button>
</footer>
<datalist id="hashtags">
<option v-for="hashtag in recentHashtags" :key="hashtag" :value="hashtag"/>

View file

@ -5,7 +5,7 @@
<div class="file" @click="showFileMenu(element, $event)" @contextmenu.prevent="showFileMenu(element, $event)">
<MkDriveFileThumbnail :data-id="element.id" class="thumbnail" :file="element" fit="cover"/>
<div v-if="element.isSensitive" class="sensitive">
<i class="fas fa-exclamation-triangle icon"></i>
<i class="ph-warning icon"></i>
</div>
</div>
</template>
@ -113,19 +113,19 @@ export default defineComponent({
if (this.menu) return;
this.menu = os.popupMenu([{
text: this.$ts.renameFile,
icon: 'fas fa-i-cursor',
icon: 'ph-cursor-text',
action: () => { this.rename(file); },
}, {
text: file.isSensitive ? this.$ts.unmarkAsSensitive : this.$ts.markAsSensitive,
icon: file.isSensitive ? 'fas fa-eye-slash' : 'fas fa-eye',
icon: file.isSensitive ? 'ph-eye-slash' : 'ph-eye',
action: () => { this.toggleSensitive(file); },
}, {
text: this.$ts.describeFile,
icon: 'fas fa-i-cursor',
icon: 'ph-cursor-text',
action: () => { this.describe(file); },
}, {
text: this.$ts.attachCancel,
icon: 'fas fa-times-circle',
icon: 'ph-circle-wavy-warning',
action: () => { this.detachMedia(file.id); },
}], ev.currentTarget ?? ev.target).then(() => this.menu = null);
},

View file

@ -4,7 +4,7 @@
class="eddddedb _button"
@click="quote()"
>
<i class="fas fa-quote-right"></i>
<i class="ph-quotes"></i>
</button>
</template>

View file

@ -1,5 +1,5 @@
<template>
<div class="jmgmzlwq _block"><i class="fas fa-exclamation-triangle" style="margin-right: 8px;"></i>{{ i18n.ts.remoteUserCaution }}<a class="link" :href="href" rel="nofollow noopener" target="_blank">{{ i18n.ts.showOnRemote }}</a></div>
<div class="jmgmzlwq _block"><i class="ph-warning" style="margin-right: 8px;"></i>{{ i18n.ts.remoteUserCaution }}<a class="link" :href="href" rel="nofollow noopener" target="_blank">{{ i18n.ts.showOnRemote }}</a></div>
</template>
<script lang="ts" setup>

View file

@ -5,11 +5,11 @@
class="eddddedb _button canRenote"
@click="renote(false, $event)"
>
<i class="fas fa-retweet"></i>
<i class="ph-repeat"></i>
<p v-if="count > 0" class="count">{{ count }}</p>
</button>
<button v-else class="eddddedb _button">
<i class="fas fa-ban"></i>
<i class="ph-prohibit"></i>
</button>
</template>
@ -69,7 +69,7 @@ const renote = (viaKeyboard = false, ev?: MouseEvent) => {
} else {
os.popupMenu([{
text: i18n.ts.renote,
icon: 'fas fa-retweet',
icon: 'ph-repeat',
action: () => {
os.api('notes/create', {
renoteId: props.note.id,
@ -78,7 +78,7 @@ const renote = (viaKeyboard = false, ev?: MouseEvent) => {
},
}, {
text: i18n.ts.quote,
icon: 'fas fa-quote-right',
icon: 'ph-quotes',
action: () => {
os.post({
renote: props.note,

View file

@ -11,7 +11,7 @@
<template #suffix>@{{ host }}</template>
</MkInput>
<MkInput v-if="!user || user && !user.usePasswordLessLogin" v-model="password" class="_formBlock" :placeholder="i18n.ts.password" type="password" :with-password-toggle="true" required data-cy-signin-password>
<template #prefix><i class="fas fa-lock"></i></template>
<template #prefix><i class="ph-lock"></i></template>
<template #caption><button class="_textButton" type="button" @click="resetPassword">{{ i18n.ts.forgotPassword }}</button></template>
</MkInput>
<MkButton class="_formBlock" type="submit" primary :disabled="signing" style="margin: 0 auto;">{{ signing ? i18n.ts.loggingIn : i18n.ts.login }}</MkButton>
@ -30,11 +30,11 @@
<p style="margin-bottom:0;">{{ i18n.ts.twoStepAuthentication }}</p>
<MkInput v-if="user && user.usePasswordLessLogin" v-model="password" type="password" :with-password-toggle="true" required>
<template #label>{{ i18n.ts.password }}</template>
<template #prefix><i class="fas fa-lock"></i></template>
<template #prefix><i class="ph-lock"></i></template>
</MkInput>
<MkInput v-model="token" type="text" pattern="^[0-9]{6}$" autocomplete="off" :spellcheck="false" required>
<template #label>{{ i18n.ts.token }}</template>
<template #prefix><i class="fas fa-gavel"></i></template>
<template #prefix><i class="ph-poker-chip"></i></template>
</MkInput>
<MkButton type="submit" :disabled="signing" primary style="margin: 0 auto;">{{ signing ? i18n.ts.loggingIn : i18n.ts.login }}</MkButton>
</div>

View file

@ -2,52 +2,52 @@
<form class="qlvuhzng _formRoot" autocomplete="new-password" @submit.prevent="onSubmit">
<MkInput v-if="instance.disableRegistration" v-model="invitationCode" class="_formBlock" type="text" :spellcheck="false" required>
<template #label>{{ i18n.ts.invitationCode }}</template>
<template #prefix><i class="fas fa-key"></i></template>
<template #prefix><i class="ph-key"></i></template>
</MkInput>
<MkInput v-model="username" class="_formBlock" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :spellcheck="false" required data-cy-signup-username @update:modelValue="onChangeUsername">
<template #label>{{ i18n.ts.username }} <div v-tooltip:dialog="i18n.ts.usernameInfo" class="_button _help"><i class="far fa-question-circle"></i></div></template>
<template #prefix>@</template>
<template #suffix>@{{ host }}</template>
<template #caption>
<span v-if="usernameState === 'wait'" style="color:#999"><i class="fas fa-spinner fa-pulse fa-fw"></i> {{ i18n.ts.checking }}</span>
<span v-else-if="usernameState === 'ok'" style="color: var(--success)"><i class="fas fa-check fa-fw"></i> {{ i18n.ts.available }}</span>
<span v-else-if="usernameState === 'unavailable'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ i18n.ts.unavailable }}</span>
<span v-else-if="usernameState === 'error'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ i18n.ts.error }}</span>
<span v-else-if="usernameState === 'invalid-format'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ i18n.ts.usernameInvalidFormat }}</span>
<span v-else-if="usernameState === 'min-range'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ i18n.ts.tooShort }}</span>
<span v-else-if="usernameState === 'max-range'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ i18n.ts.tooLong }}</span>
<span v-if="usernameState === 'wait'" style="color:#999"><i class="ph-circle-notch fa-pulse ph-fw"></i> {{ i18n.ts.checking }}</span>
<span v-else-if="usernameState === 'ok'" style="color: var(--success)"><i class="ph-check ph-fw"></i> {{ i18n.ts.available }}</span>
<span v-else-if="usernameState === 'unavailable'" style="color: var(--error)"><i class="ph-warning ph-fw"></i> {{ i18n.ts.unavailable }}</span>
<span v-else-if="usernameState === 'error'" style="color: var(--error)"><i class="ph-warning ph-fw"></i> {{ i18n.ts.error }}</span>
<span v-else-if="usernameState === 'invalid-format'" style="color: var(--error)"><i class="ph-warning ph-fw"></i> {{ i18n.ts.usernameInvalidFormat }}</span>
<span v-else-if="usernameState === 'min-range'" style="color: var(--error)"><i class="ph-warning ph-fw"></i> {{ i18n.ts.tooShort }}</span>
<span v-else-if="usernameState === 'max-range'" style="color: var(--error)"><i class="ph-warning ph-fw"></i> {{ i18n.ts.tooLong }}</span>
</template>
</MkInput>
<MkInput v-if="instance.emailRequiredForSignup" v-model="email" class="_formBlock" :debounce="true" type="email" :spellcheck="false" required data-cy-signup-email @update:modelValue="onChangeEmail">
<template #label>{{ i18n.ts.emailAddress }} <div v-tooltip:dialog="i18n.ts._signup.emailAddressInfo" class="_button _help"><i class="far fa-question-circle"></i></div></template>
<template #prefix><i class="fas fa-envelope"></i></template>
<template #prefix><i class="ph-envelope-simple-open"></i></template>
<template #caption>
<span v-if="emailState === 'wait'" style="color:#999"><i class="fas fa-spinner fa-pulse fa-fw"></i> {{ i18n.ts.checking }}</span>
<span v-else-if="emailState === 'ok'" style="color: var(--success)"><i class="fas fa-check fa-fw"></i> {{ i18n.ts.available }}</span>
<span v-else-if="emailState === 'unavailable:used'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ i18n.ts._emailUnavailable.used }}</span>
<span v-else-if="emailState === 'unavailable:format'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ i18n.ts._emailUnavailable.format }}</span>
<span v-else-if="emailState === 'unavailable:disposable'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ i18n.ts._emailUnavailable.disposable }}</span>
<span v-else-if="emailState === 'unavailable:mx'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ i18n.ts._emailUnavailable.mx }}</span>
<span v-else-if="emailState === 'unavailable:smtp'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ i18n.ts._emailUnavailable.smtp }}</span>
<span v-else-if="emailState === 'unavailable'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ i18n.ts.unavailable }}</span>
<span v-else-if="emailState === 'error'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ i18n.ts.error }}</span>
<span v-if="emailState === 'wait'" style="color:#999"><i class="ph-circle-notch fa-pulse ph-fw"></i> {{ i18n.ts.checking }}</span>
<span v-else-if="emailState === 'ok'" style="color: var(--success)"><i class="ph-check ph-fw"></i> {{ i18n.ts.available }}</span>
<span v-else-if="emailState === 'unavailable:used'" style="color: var(--error)"><i class="ph-warning ph-fw"></i> {{ i18n.ts._emailUnavailable.used }}</span>
<span v-else-if="emailState === 'unavailable:format'" style="color: var(--error)"><i class="ph-warning ph-fw"></i> {{ i18n.ts._emailUnavailable.format }}</span>
<span v-else-if="emailState === 'unavailable:disposable'" style="color: var(--error)"><i class="ph-warning ph-fw"></i> {{ i18n.ts._emailUnavailable.disposable }}</span>
<span v-else-if="emailState === 'unavailable:mx'" style="color: var(--error)"><i class="ph-warning ph-fw"></i> {{ i18n.ts._emailUnavailable.mx }}</span>
<span v-else-if="emailState === 'unavailable:smtp'" style="color: var(--error)"><i class="ph-warning ph-fw"></i> {{ i18n.ts._emailUnavailable.smtp }}</span>
<span v-else-if="emailState === 'unavailable'" style="color: var(--error)"><i class="ph-warning ph-fw"></i> {{ i18n.ts.unavailable }}</span>
<span v-else-if="emailState === 'error'" style="color: var(--error)"><i class="ph-warning ph-fw"></i> {{ i18n.ts.error }}</span>
</template>
</MkInput>
<MkInput v-model="password" class="_formBlock" type="password" autocomplete="new-password" required data-cy-signup-password @update:modelValue="onChangePassword">
<template #label>{{ i18n.ts.password }}</template>
<template #prefix><i class="fas fa-lock"></i></template>
<template #prefix><i class="ph-lock"></i></template>
<template #caption>
<span v-if="passwordStrength == 'low'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ i18n.ts.weakPassword }}</span>
<span v-if="passwordStrength == 'medium'" style="color: var(--warn)"><i class="fas fa-check fa-fw"></i> {{ i18n.ts.normalPassword }}</span>
<span v-if="passwordStrength == 'high'" style="color: var(--success)"><i class="fas fa-check fa-fw"></i> {{ i18n.ts.strongPassword }}</span>
<span v-if="passwordStrength == 'low'" style="color: var(--error)"><i class="ph-warning ph-fw"></i> {{ i18n.ts.weakPassword }}</span>
<span v-if="passwordStrength == 'medium'" style="color: var(--warn)"><i class="ph-check ph-fw"></i> {{ i18n.ts.normalPassword }}</span>
<span v-if="passwordStrength == 'high'" style="color: var(--success)"><i class="ph-check ph-fw"></i> {{ i18n.ts.strongPassword }}</span>
</template>
</MkInput>
<MkInput v-model="retypedPassword" class="_formBlock" type="password" autocomplete="new-password" required data-cy-signup-password-retype @update:modelValue="onChangePasswordRetype">
<template #label>{{ i18n.ts.password }} ({{ i18n.ts.retype }})</template>
<template #prefix><i class="fas fa-lock"></i></template>
<template #prefix><i class="ph-lock"></i></template>
<template #caption>
<span v-if="passwordRetypeState == 'match'" style="color: var(--success)"><i class="fas fa-check fa-fw"></i> {{ i18n.ts.passwordMatched }}</span>
<span v-if="passwordRetypeState == 'not-match'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ i18n.ts.passwordNotMatched }}</span>
<span v-if="passwordRetypeState == 'match'" style="color: var(--success)"><i class="ph-check ph-fw"></i> {{ i18n.ts.passwordMatched }}</span>
<span v-if="passwordRetypeState == 'not-match'" style="color: var(--error)"><i class="ph-warning ph-fw"></i> {{ i18n.ts.passwordNotMatched }}</span>
</template>
</MkInput>
<MkSwitch v-if="instance.tosUrl" v-model="ToSAgreement" class="_formBlock tou">

View file

@ -1,6 +1,6 @@
<template>
<button class="skdfgljsdkf _button" @click="star($event)">
<i class="fas fa-star"></i>
<i class="ph-star"></i>
</button>
</template>

View file

@ -2,7 +2,7 @@
<div class="wrmlmaau" :class="{ collapsed, isLong }">
<div class="body">
<span v-if="note.deletedAt" style="opacity: 0.5">({{ i18n.ts.deleted }})</span>
<MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="fas fa-reply"></i></MkA>
<MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="ph-arrow-bend-up-left"></i></MkA>
<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">RN: ...</MkA>
</div>

View file

@ -6,15 +6,15 @@
<div class="items">
<template v-for="(item, i) in group.items">
<a v-if="item.type === 'a'" :href="item.href" :target="item.target" :tabindex="i" class="_button item" :class="{ danger: item.danger, active: item.active }">
<i v-if="item.icon" class="icon fa-fw" :class="item.icon"></i>
<i v-if="item.icon" class="icon ph-fw" :class="item.icon"></i>
<span class="text">{{ item.text }}</span>
</a>
<button v-else-if="item.type === 'button'" :tabindex="i" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="ev => item.action(ev)">
<i v-if="item.icon" class="icon fa-fw" :class="item.icon"></i>
<i v-if="item.icon" class="icon ph-fw" :class="item.icon"></i>
<span class="text">{{ item.text }}</span>
</button>
<MkA v-else :to="item.to" :tabindex="i" class="_button item" :class="{ danger: item.danger, active: item.active }">
<i v-if="item.icon" class="icon fa-fw" :class="item.icon"></i>
<i v-if="item.icon" class="icon ph-fw" :class="item.icon"></i>
<span class="text">{{ item.text }}</span>
</MkA>
</template>

View file

@ -1,6 +1,6 @@
<template>
<div v-if="playerEnabled" class="player" :style="`padding: ${(player.height || 0) / (player.width || 1) * 100}% 0 0`">
<button class="disablePlayer" :title="i18n.ts.disablePlayer" @click="playerEnabled = false"><i class="fas fa-times"></i></button>
<button class="disablePlayer" :title="i18n.ts.disablePlayer" @click="playerEnabled = false"><i class="ph-x"></i></button>
<iframe :src="player.url + (player.url.match(/\?/) ? '&autoplay=1&auto_play=1' : '?autoplay=1&auto_play=1')" :width="player.width || '100%'" :heigth="player.height || 250" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen/>
</div>
<div v-else-if="tweetId && tweetExpanded" ref="twitter" class="twitter">
@ -10,7 +10,7 @@
<transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
<component :is="self ? 'MkA' : 'a'" v-if="!fetching" class="link" :class="{ compact }" :[attr]="self ? url.substr(local.length) : url" rel="nofollow noopener" :target="target" :title="url">
<div v-if="thumbnail" class="thumbnail" :style="`background-image: url('${thumbnail}')`">
<button v-if="!playerEnabled && player.url" class="_button" :title="i18n.ts.enablePlayer" @click.prevent="playerEnabled = true"><i class="fas fa-play-circle"></i></button>
<button v-if="!playerEnabled && player.url" class="_button" :title="i18n.ts.enablePlayer" @click.prevent="playerEnabled = true"><i class="ph-play-circle"></i></button>
</div>
<article>
<header>

View file

@ -1,10 +1,10 @@
<template>
<span v-if="note.visibility !== 'public'" :class="$style.visibility">
<i v-if="note.visibility === 'home'" class="fas fa-home"></i>
<i v-else-if="note.visibility === 'followers'" class="fas fa-unlock"></i>
<i v-else-if="note.visibility === 'specified'" ref="specified" class="fas fa-envelope"></i>
<i v-if="note.visibility === 'home'" class="ph-house"></i>
<i v-else-if="note.visibility === 'followers'" class="ph-lock-simple-open"></i>
<i v-else-if="note.visibility === 'specified'" ref="specified" class="ph-envelope-simple-open"></i>
</span>
<span v-if="note.localOnly" :class="$style.localOnly"><i class="fas fa-biohazard"></i></span>
<span v-if="note.localOnly" :class="$style.localOnly"><i class="ph-hand-fist"></i></span>
</template>
<script lang="ts" setup>

View file

@ -2,28 +2,28 @@
<MkModal ref="modal" :z-priority="'high'" :src="src" @click="modal.close()" @closed="emit('closed')">
<div class="gqyayizv _popup">
<button key="public" class="_button" :class="{ active: v === 'public' }" data-index="1" @click="choose('public')">
<div><i class="fas fa-globe"></i></div>
<div><i class="ph-planet"></i></div>
<div>
<span>{{ i18n.ts._visibility.public }}</span>
<span>{{ i18n.ts._visibility.publicDescription }}</span>
</div>
</button>
<button key="home" class="_button" :class="{ active: v === 'home' }" data-index="2" @click="choose('home')">
<div><i class="fas fa-home"></i></div>
<div><i class="ph-house"></i></div>
<div>
<span>{{ i18n.ts._visibility.home }}</span>
<span>{{ i18n.ts._visibility.homeDescription }}</span>
</div>
</button>
<button key="followers" class="_button" :class="{ active: v === 'followers' }" data-index="3" @click="choose('followers')">
<div><i class="fas fa-unlock"></i></div>
<div><i class="ph-lock-simple-open"></i></div>
<div>
<span>{{ i18n.ts._visibility.followers }}</span>
<span>{{ i18n.ts._visibility.followersDescription }}</span>
</div>
</button>
<button key="specified" :disabled="localOnly" class="_button" :class="{ active: v === 'specified' }" data-index="4" @click="choose('specified')">
<div><i class="fas fa-envelope"></i></div>
<div><i class="ph-envelope-simple-open"></i></div>
<div>
<span>{{ i18n.ts._visibility.specified }}</span>
<span>{{ i18n.ts._visibility.specifiedDescription }}</span>
@ -31,12 +31,12 @@
</button>
<div class="divider"></div>
<button key="localOnly" class="_button localOnly" :class="{ active: localOnly }" data-index="5" @click="localOnly = !localOnly">
<div><i class="fas fa-biohazard"></i></div>
<div><i class="ph-hand-fist"></i></div>
<div>
<span>{{ i18n.ts._visibility.localOnly }}</span>
<span>{{ i18n.ts._visibility.localOnlyDescription }}</span>
</div>
<div><i :class="localOnly ? 'fas fa-toggle-on' : 'fas fa-toggle-off'"></i></div>
<div><i :class="localOnly ? 'ph-toggle-right' : 'ph-toggle-left'"></i></div>
</button>
</div>
</MkModal>

View file

@ -1,8 +1,8 @@
<template>
<MkModal ref="modal" :prefer-type="'dialog'" :z-priority="'high'" @click="success ? done() : () => {}" @closed="emit('closed')">
<div class="iuyakobc" :class="{ iconOnly: (text == null) || success }">
<i v-if="success" class="fas fa-check icon success"></i>
<i v-else class="fas fa-spinner fa-pulse icon waiting"></i>
<i v-if="success" class="ph-check icon success"></i>
<i v-else class="ph-circle-notch fa-pulse icon waiting"></i>
<div v-if="text && !success" class="text">{{ text }}<MkEllipsis/></div>
</div>
</MkModal>

View file

@ -6,7 +6,7 @@
<template #label>{{ i18n.ts.selectWidget }}</template>
<option v-for="widget in widgetDefs" :key="widget" :value="widget">{{ i18n.t(`_widgets.${widget}`) }}</option>
</MkSelect>
<MkButton inline primary class="mk-widget-add" @click="addWidget"><i class="fas fa-plus"></i> {{ i18n.ts.add }}</MkButton>
<MkButton inline primary class="mk-widget-add" @click="addWidget"><i class="ph-plus"></i> {{ i18n.ts.add }}</MkButton>
<MkButton inline @click="$emit('exit')">{{ i18n.ts.close }}</MkButton>
</header>
<XDraggable
@ -17,8 +17,8 @@
>
<template #item="{element}">
<div class="customize-container">
<button class="config _button" @click.prevent.stop="configWidget(element.id)"><i class="fas fa-cog"></i></button>
<button class="remove _button" @click.prevent.stop="removeWidget(element)"><i class="fas fa-times"></i></button>
<button class="config _button" @click.prevent.stop="configWidget(element.id)"><i class="ph-gear-six"></i></button>
<button class="remove _button" @click.prevent.stop="removeWidget(element)"><i class="ph-x"></i></button>
<div class="handle">
<component :is="`mkw-${element.name}`" :ref="el => widgetRefs[element.id] = el" class="widget" :widget="element" @updateProps="updateWidget(element.id, $event)"/>
</div>
@ -104,7 +104,7 @@ function onContextmenu(widget: Widget, ev: MouseEvent) {
type: 'label',
text: i18n.t(`_widgets.${widget.name}`),
}, {
icon: 'fas fa-cog',
icon: 'ph-gear-six',
text: i18n.ts.settings,
action: () => {
configWidget(widget.id);

View file

@ -11,9 +11,9 @@
</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" class="button _button" @click="unMaximize()"><i class="fas fa-window-restore"></i></button>
<button v-else-if="canResize && !maximized" class="button _button" @click="maximize()"><i class="fas fa-window-maximize"></i></button>
<button v-if="closeButton" class="button _button" @click="close()"><i class="fas fa-times"></i></button>
<button v-if="canResize && maximized" class="button _button" @click="unMaximize()"><i class="ph-copy"></i></button>
<button v-else-if="canResize && !maximized" class="button _button" @click="maximize()"><i class="ph-browser"></i></button>
<button v-if="closeButton" class="button _button" @click="close()"><i class="ph-x"></i></button>
</span>
</div>
<div class="body">

View file

@ -10,7 +10,7 @@
@keydown.enter="toggle"
>
<span ref="button" v-adaptive-border v-tooltip="checked ? i18n.ts.itsOn : i18n.ts.itsOff" class="button" @click.prevent="toggle">
<i class="check fas fa-check"></i>
<i class="check ph-check"></i>
</span>
<span class="label">
<!-- TODO: 無名slotの方は廃止 -->

View file

@ -5,8 +5,8 @@
<span class="text"><slot name="label"></slot></span>
<span class="right">
<span class="text"><slot name="suffix"></slot></span>
<i v-if="opened" class="fas fa-angle-up icon"></i>
<i v-else class="fas fa-angle-down icon"></i>
<i v-if="opened" class="ph-caret-up icon"></i>
<i v-else class="ph-caret-down icon"></i>
</span>
</div>
<KeepAlive>

View file

@ -29,7 +29,7 @@
</div>
<div class="caption"><slot name="caption"></slot></div>
<MkButton v-if="manualSave && changed" primary class="save" @click="updated"><i class="fas fa-check"></i> {{ i18n.ts.save }}</MkButton>
<MkButton v-if="manualSave && changed" primary class="save" @click="updated"><i class="ph-check"></i> {{ i18n.ts.save }}</MkButton>
</div>
</template>

View file

@ -5,7 +5,7 @@
<span class="text"><slot></slot></span>
<span class="right">
<span class="text"><slot name="suffix"></slot></span>
<i class="fas fa-external-link-alt icon"></i>
<i class="ph-arrow-square-out icon"></i>
</span>
</a>
<MkA v-else class="main _button" :class="{ active }" :to="to" :behavior="behavior">
@ -13,7 +13,7 @@
<span class="text"><slot></slot></span>
<span class="right">
<span class="text"><slot name="suffix"></slot></span>
<i class="fas fa-chevron-right icon"></i>
<i class="ph-caret-right icon"></i>
</span>
</MkA>
</div>

View file

@ -18,11 +18,11 @@
>
<slot></slot>
</select>
<div ref="suffixEl" class="suffix"><i class="fas fa-chevron-down"></i></div>
<div ref="suffixEl" class="suffix"><i class="ph-caret-down"></i></div>
</div>
<div class="caption"><slot name="caption"></slot></div>
<MkButton v-if="manualSave && changed" primary @click="updated"><i class="fas fa-save"></i> {{ i18n.ts.save }}</MkButton>
<MkButton v-if="manualSave && changed" primary @click="updated"><i class="ph-floppy-disk-back"></i> {{ i18n.ts.save }}</MkButton>
</div>
</template>

View file

@ -8,8 +8,8 @@
</div>
<div v-else>
<div class="wszdbhzo">
<div><i class="fas fa-exclamation-triangle"></i> {{ $ts.somethingHappened }}</div>
<MkButton inline class="retry" @click="retry"><i class="fas fa-redo-alt"></i> {{ $ts.retry }}</MkButton>
<div><i class="ph-warning"></i> {{ $ts.somethingHappened }}</div>
<MkButton inline class="retry" @click="retry"><i class="ph-arrow-clockwise"></i> {{ $ts.retry }}</MkButton>
</div>
</div>
</transition>

View file

@ -22,7 +22,7 @@
</div>
<div class="caption"><slot name="caption"></slot></div>
<MkButton v-if="manualSave && changed" primary class="save" @click="updated"><i class="fas fa-save"></i> {{ i18n.ts.save }}</MkButton>
<MkButton v-if="manualSave && changed" primary class="save" @click="updated"><i class="ph-floppy-disk-back"></i> {{ i18n.ts.save }}</MkButton>
</div>
</template>

View file

@ -41,25 +41,25 @@ function onContextmenu(ev) {
type: 'label',
text: props.to,
}, {
icon: 'fas fa-window-maximize',
icon: 'ph-browser',
text: i18n.ts.openInWindow,
action: () => {
os.pageWindow(props.to);
},
}, {
icon: 'fas fa-expand-alt',
icon: 'ph-arrows-out-simple',
text: i18n.ts.showInPage,
action: () => {
router.push(props.to, 'forcePage');
},
}, null, {
icon: 'fas fa-external-link-alt',
icon: 'ph-arrow-square-out',
text: i18n.ts.openInNewTab,
action: () => {
window.open(props.to, '_blank');
},
}, {
icon: 'fas fa-link',
icon: 'ph-link-simple',
text: i18n.ts.copyLink,
action: () => {
copyToClipboard(`${url}${props.to}`);

View file

@ -3,7 +3,7 @@
<div v-if="!showMenu" class="main" :class="chosen.place">
<a :href="chosen.url" target="_blank">
<img :src="chosen.imageUrl">
<button class="_button menu" @click.prevent.stop="toggleMenu"><span class="fas fa-info-circle info-circle"></span></button>
<button class="_button menu" @click.prevent.stop="toggleMenu"><span class="ph-info info-circle"></span></button>
</a>
</div>
<div v-else class="menu">

View file

@ -2,7 +2,7 @@
<transition :name="$store.state.animation ? 'zoom' : ''" appear>
<div class="mjndxjcg">
<img src="/static-assets/badges/error.png" class="_ghost" alt="Error"/>
<p><i class="fas fa-exclamation-triangle"></i> {{ i18n.ts.somethingHappened }}</p>
<p><i class="ph-warning"></i> {{ i18n.ts.somethingHappened }}</p>
<MkButton class="button" @click="() => $emit('retry')">{{ i18n.ts.retry }}</MkButton>
</div>
</transition>

View file

@ -14,7 +14,7 @@
<span v-if="pathname != ''" class="pathname">{{ self ? pathname.substr(1) : pathname }}</span>
<span class="query">{{ query }}</span>
<span class="hash">{{ hash }}</span>
<i v-if="target === '_blank'" class="fas fa-external-link-square-alt icon"></i>
<i v-if="target === '_blank'" class="ph-arrow-square-out icon"></i>
</component>
</template>

View file

@ -2,8 +2,8 @@
<div class="ngbfujlo">
<MkTextarea :model-value="text" readonly style="margin: 0;"></MkTextarea>
<MkButton class="button" primary :disabled="posting || posted" @click="post()">
<i v-if="posted" class="fas fa-check"></i>
<i v-else class="fas fa-paper-plane"></i>
<i v-if="posted" class="ph-check"></i>
<i v-else class="ph-paper-plane-tilt"></i>
</MkButton>
</div>
</template>

View file

@ -9,102 +9,102 @@ import { unisonReload } from '@/scripts/unison-reload';
export const navbarItemDef = reactive({
notifications: {
title: 'notifications',
icon: 'fas fa-bell',
icon: 'ph-bell',
show: computed(() => $i != null),
indicated: computed(() => $i != null && $i.hasUnreadNotification),
to: '/my/notifications',
},
messaging: {
title: 'messaging',
icon: 'fas fa-comments',
icon: 'ph-chats-teardrop',
show: computed(() => $i != null),
indicated: computed(() => $i != null && $i.hasUnreadMessagingMessage),
to: '/my/messaging',
},
drive: {
title: 'drive',
icon: 'fas fa-cloud',
icon: 'ph-cloud',
show: computed(() => $i != null),
to: '/my/drive',
},
followRequests: {
title: 'followRequests',
icon: 'fas fa-user-clock',
icon: 'ph-hand-waving',
show: computed(() => $i != null && $i.isLocked),
indicated: computed(() => $i != null && $i.hasPendingReceivedFollowRequest),
to: '/my/follow-requests',
},
explore: {
title: 'explore',
icon: 'fas fa-hashtag',
icon: 'ph-hash',
to: '/explore',
},
announcements: {
title: 'announcements',
icon: 'fas fa-broadcast-tower',
icon: 'ph-megaphone-simple',
indicated: computed(() => $i != null && $i.hasUnreadAnnouncement),
to: '/announcements',
},
search: {
title: 'search',
icon: 'fas fa-search',
icon: 'ph-magnifying-glass',
action: () => search(),
},
lists: {
title: 'lists',
icon: 'fas fa-list-ul',
icon: 'ph-list-bullets',
show: computed(() => $i != null),
to: '/my/lists',
},
/*
groups: {
title: 'groups',
icon: 'fas fa-users',
icon: 'ph-users',
show: computed(() => $i != null),
to: '/my/groups',
},
*/
antennas: {
title: 'antennas',
icon: 'fas fa-satellite',
icon: 'ph-flying-saucer',
show: computed(() => $i != null),
to: '/my/antennas',
},
favorites: {
title: 'favorites',
icon: 'fas fa-star',
icon: 'ph-star',
show: computed(() => $i != null),
to: '/my/favorites',
},
pages: {
title: 'pages',
icon: 'fas fa-file-alt',
icon: 'ph-file-text',
to: '/pages',
},
gallery: {
title: 'gallery',
icon: 'fas fa-icons',
icon: 'ph-image-square',
to: '/gallery',
},
clips: {
title: 'clip',
icon: 'fas fa-paperclip',
icon: 'ph-paperclip',
show: computed(() => $i != null),
to: '/my/clips',
},
channels: {
title: 'channel',
icon: 'fas fa-satellite-dish',
icon: 'ph-television',
to: '/channels',
},
groups: {
title: 'groups',
icon: 'fas fa-users',
icon: 'ph-users',
to: '/my/groups',
},
ui: {
title: 'switchUi',
icon: 'fas fa-columns',
icon: 'ph-layout',
action: (ev) => {
os.popupMenu([{
text: i18n.ts.default,
@ -132,7 +132,7 @@ export const navbarItemDef = reactive({
},
reload: {
title: 'reload',
icon: 'fas fa-refresh',
icon: 'ph-arrows-clockwise',
action: (ev) => {
location.reload();
},

View file

@ -3,7 +3,7 @@
<transition :name="$store.state.animation ? 'zoom' : ''" appear>
<div v-show="loaded" class="mjndxjch">
<img src="/static-assets/badges/error.png" class="_ghost" alt="Error"/>
<p><b><i class="fas fa-exclamation-triangle"></i> {{ i18n.ts.pageLoadError }}</b></p>
<p><b><i class="ph-warning"></i> {{ i18n.ts.pageLoadError }}</b></p>
<p v-if="meta && (version === meta.version)">{{ i18n.ts.pageLoadErrorDescription }}</p>
<p v-else-if="serverIsDead">{{ i18n.ts.serverIsDead }}</p>
<template v-else>
@ -58,7 +58,7 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.error,
icon: 'fas fa-exclamation-triangle',
icon: 'ph-warning',
});
</script>

View file

@ -20,7 +20,7 @@
<FormSection>
<div class="_formLinks">
<FormLink to="https://codeberg.org/thatonecalculator/calckey" external>
<template #icon><i class="fas fa-code"></i></template>
<template #icon><i class="ph-code"></i></template>
{{ i18n.ts._aboutMisskey.source }}
<template #suffix>Codeberg</template>
</FormLink>

View file

@ -2,7 +2,7 @@
<div class="driuhtrh">
<div class="query">
<MkInput v-model="q" class="" :placeholder="$ts.search">
<template #prefix><i class="fas fa-search"></i></template>
<template #prefix><i class="ph-magnifying-glass"></i></template>
</MkInput>
<!-- たくさんあると邪魔

View file

@ -2,7 +2,7 @@
<div class="taeiyria">
<div class="query">
<MkInput v-model="host" :debounce="true" class="">
<template #prefix><i class="fas fa-search"></i></template>
<template #prefix><i class="ph-magnifying-glass"></i></template>
<template #label>{{ i18n.ts.host }}</template>
</MkInput>
<FormSplit style="margin-top: var(--margin);">

View file

@ -136,15 +136,15 @@ const headerActions = $computed(() => []);
let theTabs = [{
key: 'overview',
title: i18n.ts.overview,
icon: 'fas fa-sitemap',
icon: 'ph-map-trifold',
}, {
key: 'emojis',
title: i18n.ts.customEmojis,
icon: 'fas fa-laugh',
icon: 'ph-smiley-wink',
}, {
key: 'charts',
title: i18n.ts.charts,
icon: 'fas fa-chart-simple',
icon: 'ph-chart-bar',
}];
if (iAmModerator) {
@ -152,7 +152,7 @@ if (iAmModerator) {
{
key: 'federation',
title: i18n.ts.federation,
icon: 'fas fa-globe',
icon: 'ph-planet',
},
);
}
@ -161,7 +161,7 @@ let headerTabs = $computed(() => theTabs);
definePageMetadata(computed(() => ({
title: i18n.ts.instanceInfo,
icon: 'fas fa-info-circle',
icon: 'ph-info',
})));
let swiperRef = null;

View file

@ -45,7 +45,7 @@
</div>
<div class="_formBlock">
<MkButton danger @click="del"><i class="fas fa-trash-alt"></i> {{ i18n.ts.delete }}</MkButton>
<MkButton danger @click="del"><i class="ph-trash"></i> {{ i18n.ts.delete }}</MkButton>
</div>
</div>
</swiper-slide>
@ -140,7 +140,7 @@ async function toggleIsSensitive(v) {
const headerActions = $computed(() => [{
text: i18n.ts.openInNewTab,
icon: 'fas fa-external-link-alt',
icon: 'ph-arrow-square-out',
handler: () => {
window.open(file.url, '_blank');
},
@ -149,20 +149,20 @@ const headerActions = $computed(() => [{
const headerTabs = $computed(() => [{
key: 'overview',
title: i18n.ts.overview,
icon: 'fas fa-info-circle',
icon: 'ph-info',
}, iAmModerator ? {
key: 'ip',
title: 'IP',
icon: 'fas fa-bars-staggered',
icon: 'ph-receipt',
} : null, {
key: 'raw',
title: 'Raw data',
icon: 'fas fa-code',
icon: 'ph-code',
}]);
definePageMetadata(computed(() => ({
title: file ? i18n.ts.file + ': ' + file.name : i18n.ts.file,
icon: 'fas fa-file',
icon: 'ph-file',
})));
let swiperRef = null;

View file

@ -86,7 +86,7 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.abuseReports,
icon: 'fas fa-exclamation-circle',
icon: 'ph-warning-circle',
});
</script>

View file

@ -37,8 +37,8 @@
<template #label>{{ i18n.ts.memo }}</template>
</MkTextarea>
<div class="buttons _formBlock">
<MkButton class="button" inline primary style="margin-right: 12px;" @click="save(ad)"><i class="fas fa-save"></i> {{ i18n.ts.save }}</MkButton>
<MkButton class="button" inline danger @click="remove(ad)"><i class="fas fa-trash-alt"></i> {{ i18n.ts.remove }}</MkButton>
<MkButton class="button" inline primary style="margin-right: 12px;" @click="save(ad)"><i class="ph-floppy-disk-back"></i> {{ i18n.ts.save }}</MkButton>
<MkButton class="button" inline danger @click="remove(ad)"><i class="ph-trash"></i> {{ i18n.ts.remove }}</MkButton>
</div>
</div>
</div>
@ -106,7 +106,7 @@ function save(ad) {
const headerActions = $computed(() => [{
asFullButton: true,
icon: 'fas fa-plus',
icon: 'ph-plus',
text: i18n.ts.add,
handler: add,
}]);
@ -115,7 +115,7 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.ads,
icon: 'fas fa-audio-description',
icon: 'ph-money',
});
</script>

View file

@ -16,8 +16,8 @@
</MkInput>
<p v-if="announcement.reads">{{ i18n.t('nUsersRead', { n: announcement.reads }) }}</p>
<div class="buttons">
<MkButton class="button" inline primary @click="save(announcement)"><i class="fas fa-save"></i> {{ i18n.ts.save }}</MkButton>
<MkButton class="button" inline @click="remove(announcement)"><i class="fas fa-trash-alt"></i> {{ i18n.ts.remove }}</MkButton>
<MkButton class="button" inline primary @click="save(announcement)"><i class="ph-floppy-disk-back"></i> {{ i18n.ts.save }}</MkButton>
<MkButton class="button" inline @click="remove(announcement)"><i class="ph-trash"></i> {{ i18n.ts.remove }}</MkButton>
</div>
</div>
</section>
@ -92,7 +92,7 @@ function save(announcement) {
const headerActions = $computed(() => [{
asFullButton: true,
icon: 'fas fa-plus',
icon: 'ph-plus',
text: i18n.ts.add,
handler: add,
}]);
@ -101,7 +101,7 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.announcements,
icon: 'fas fa-broadcast-tower',
icon: 'ph-megaphone-simple',
});
</script>

View file

@ -10,11 +10,11 @@
<template v-if="provider === 'hcaptcha'">
<FormInput v-model="hcaptchaSiteKey" class="_formBlock">
<template #prefix><i class="fas fa-key"></i></template>
<template #prefix><i class="ph-key"></i></template>
<template #label>{{ i18n.ts.hcaptchaSiteKey }}</template>
</FormInput>
<FormInput v-model="hcaptchaSecretKey" class="_formBlock">
<template #prefix><i class="fas fa-key"></i></template>
<template #prefix><i class="ph-key"></i></template>
<template #label>{{ i18n.ts.hcaptchaSecretKey }}</template>
</FormInput>
<FormSlot class="_formBlock">
@ -24,11 +24,11 @@
</template>
<template v-else-if="provider === 'recaptcha'">
<FormInput v-model="recaptchaSiteKey" class="_formBlock">
<template #prefix><i class="fas fa-key"></i></template>
<template #prefix><i class="ph-key"></i></template>
<template #label>{{ i18n.ts.recaptchaSiteKey }}</template>
</FormInput>
<FormInput v-model="recaptchaSecretKey" class="_formBlock">
<template #prefix><i class="fas fa-key"></i></template>
<template #prefix><i class="ph-key"></i></template>
<template #label>{{ i18n.ts.recaptchaSecretKey }}</template>
</FormInput>
<FormSlot v-if="recaptchaSiteKey" class="_formBlock">
@ -37,7 +37,7 @@
</FormSlot>
</template>
<FormButton primary @click="save"><i class="fas fa-save"></i> {{ i18n.ts.save }}</FormButton>
<FormButton primary @click="save"><i class="ph-floppy-disk-back"></i> {{ i18n.ts.save }}</FormButton>
</div>
</FormSuspense>
</div>

View file

@ -43,6 +43,6 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.customCss,
icon: 'fas fa-code',
icon: 'ph-code',
});
</script>

View file

@ -28,6 +28,6 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.database,
icon: 'fas fa-database',
icon: 'ph-database',
});
</script>

View file

@ -112,7 +112,7 @@ const headerActions = $computed(() => [{
handler: testEmail,
}, {
asFullButton: true,
icon: 'fas fa-check',
icon: 'ph-check',
text: i18n.ts.save,
handler: save,
}]);
@ -121,6 +121,6 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.emailServer,
icon: 'fas fa-envelope',
icon: 'ph-envelope-simple-open',
});
</script>

View file

@ -22,7 +22,7 @@
<template #label>{{ i18n.ts.tags }}</template>
<template #caption>{{ i18n.ts.setMultipleBySeparatingWithSpace }}</template>
</MkInput>
<MkButton danger @click="del()"><i class="fas fa-trash-alt"></i> {{ i18n.ts.delete }}</MkButton>
<MkButton danger @click="del()"><i class="ph-trash"></i> {{ i18n.ts.delete }}</MkButton>
</div>
</div>
</XModalWindow>

View file

@ -6,7 +6,7 @@
<div class="ogwlenmc">
<div v-if="tab === 'local'" class="local">
<MkInput v-model="query" :debounce="true" type="search">
<template #prefix><i class="fas fa-search"></i></template>
<template #prefix><i class="ph-magnifying-glass"></i></template>
<template #label>{{ i18n.ts.search }}</template>
</MkInput>
<MkSwitch v-model="selectMode" style="margin: 8px 0;">
@ -39,7 +39,7 @@
<div v-else-if="tab === 'remote'" class="remote">
<FormSplit>
<MkInput v-model="queryRemote" :debounce="true" type="search">
<template #prefix><i class="fas fa-search"></i></template>
<template #prefix><i class="ph-magnifying-glass"></i></template>
<template #label>{{ i18n.ts.search }}</template>
</MkInput>
<MkInput v-model="host" :debounce="true">
@ -164,14 +164,14 @@ const remoteMenu = (emoji, ev: MouseEvent) => {
text: ':' + emoji.name + ':',
}, {
text: i18n.ts.import,
icon: 'fas fa-plus',
icon: 'ph-plus',
action: () => { im(emoji); },
}], ev.currentTarget ?? ev.target);
};
const menu = (ev: MouseEvent) => {
os.popupMenu([{
icon: 'fas fa-download',
icon: 'ph-download-simple',
text: i18n.ts.export,
action: async () => {
os.api('export-custom-emojis', {
@ -189,7 +189,7 @@ const menu = (ev: MouseEvent) => {
});
},
}, {
icon: 'fas fa-upload',
icon: 'ph-upload-simple',
text: i18n.ts.import,
action: async () => {
const file = await selectFile(ev.currentTarget ?? ev.target);
@ -273,11 +273,11 @@ const delBulk = async () => {
const headerActions = $computed(() => [{
asFullButton: true,
icon: 'fas fa-plus',
icon: 'ph-plus',
text: i18n.ts.addEmoji,
handler: add,
}, {
icon: 'fas fa-ellipsis-h',
icon: 'ph-three-dots-outline',
handler: menu,
}]);
@ -291,7 +291,7 @@ const headerTabs = $computed(() => [{
definePageMetadata(computed(() => ({
title: i18n.ts.customEmojis,
icon: 'fas fa-laugh',
icon: 'ph-smiley-wink',
})));
</script>

View file

@ -97,11 +97,11 @@ async function find() {
const headerActions = $computed(() => [{
text: i18n.ts.lookup,
icon: 'fas fa-search',
icon: 'ph-magnifying-glass',
handler: find,
}, {
text: i18n.ts.clearCachedFiles,
icon: 'fas fa-trash-alt',
icon: 'ph-trash',
handler: clear,
}]);
@ -109,7 +109,7 @@ const headerTabs = $computed(() => []);
definePageMetadata(computed(() => ({
title: i18n.ts.files,
icon: 'fas fa-cloud',
icon: 'ph-cloud',
})));
</script>

View file

@ -43,7 +43,7 @@ const router = useRouter();
const indexInfo = {
title: i18n.ts.controlPanel,
icon: 'fas fa-cog',
icon: 'ph-gear-six',
hideHeader: true,
};
@ -89,59 +89,59 @@ const menuDef = $computed(() => [{
title: i18n.ts.quickAction,
items: [{
type: 'button',
icon: 'fas fa-search',
icon: 'ph-magnifying-glass',
text: i18n.ts.lookup,
action: lookup,
}, ...(instance.disableRegistration ? [{
type: 'button',
icon: 'fas fa-user',
icon: 'ph-user',
text: i18n.ts.invite,
action: invite,
}] : [])],
}, {
title: i18n.ts.administration,
items: [{
icon: 'fas fa-tachometer-alt',
icon: 'ph-gauge',
text: i18n.ts.dashboard,
to: '/admin/overview',
active: currentPage?.route.name === 'overview',
}, {
icon: 'fas fa-users',
icon: 'ph-users',
text: i18n.ts.users,
to: '/admin/users',
active: currentPage?.route.name === 'users',
}, {
icon: 'fas fa-laugh',
icon: 'ph-smiley-wink',
text: i18n.ts.customEmojis,
to: '/admin/emojis',
active: currentPage?.route.name === 'emojis',
}, {
icon: 'fas fa-globe',
icon: 'ph-planet',
text: i18n.ts.federation,
to: '/about#federation',
active: currentPage?.route.name === 'federation',
}, {
icon: 'fas fa-clipboard-list',
icon: 'ph-clipboard-text',
text: i18n.ts.jobQueue,
to: '/admin/queue',
active: currentPage?.route.name === 'queue',
}, {
icon: 'fas fa-cloud',
icon: 'ph-cloud',
text: i18n.ts.files,
to: '/admin/files',
active: currentPage?.route.name === 'files',
}, {
icon: 'fas fa-broadcast-tower',
icon: 'ph-megaphone-simple',
text: i18n.ts.announcements,
to: '/admin/announcements',
active: currentPage?.route.name === 'announcements',
}, {
icon: 'fas fa-audio-description',
icon: 'ph-money',
text: i18n.ts.ads,
to: '/admin/ads',
active: currentPage?.route.name === 'ads',
}, {
icon: 'fas fa-exclamation-circle',
icon: 'ph-warning-circle',
text: i18n.ts.abuseReports,
to: '/admin/abuses',
active: currentPage?.route.name === 'abuses',
@ -149,47 +149,47 @@ const menuDef = $computed(() => [{
}, {
title: i18n.ts.settings,
items: [{
icon: 'fas fa-cog',
icon: 'ph-gear-six',
text: i18n.ts.general,
to: '/admin/settings',
active: currentPage?.route.name === 'settings',
}, {
icon: 'fas fa-envelope',
icon: 'ph-envelope-simple-open',
text: i18n.ts.emailServer,
to: '/admin/email-settings',
active: currentPage?.route.name === 'email-settings',
}, {
icon: 'fas fa-cloud',
icon: 'ph-cloud',
text: i18n.ts.objectStorage,
to: '/admin/object-storage',
active: currentPage?.route.name === 'object-storage',
}, {
icon: 'fas fa-lock',
icon: 'ph-lock',
text: i18n.ts.security,
to: '/admin/security',
active: currentPage?.route.name === 'security',
}, {
icon: 'fas fa-globe',
icon: 'ph-planet',
text: i18n.ts.relays,
to: '/admin/relays',
active: currentPage?.route.name === 'relays',
}, {
icon: 'fas fa-share-alt',
icon: 'ph-share-network',
text: i18n.ts.integration,
to: '/admin/integrations',
active: currentPage?.route.name === 'integrations',
}, {
icon: 'fas fa-ban',
icon: 'ph-prohibit',
text: i18n.ts.instanceBlocking,
to: '/admin/instance-block',
active: currentPage?.route.name === 'instance-block',
}, {
icon: 'fas fa-ghost',
icon: 'ph-ghost',
text: i18n.ts.proxyAccount,
to: '/admin/proxy-account',
active: currentPage?.route.name === 'proxy-account',
}, {
icon: 'fas fa-cogs',
icon: 'ph-gear-six',
text: i18n.ts.other,
to: '/admin/other-settings',
active: currentPage?.route.name === 'other-settings',
@ -197,7 +197,7 @@ const menuDef = $computed(() => [{
}, {
title: i18n.ts.info,
items: [{
icon: 'fas fa-database',
icon: 'ph-database',
text: i18n.ts.database,
to: '/admin/database',
active: currentPage?.route.name === 'database',
@ -248,25 +248,25 @@ const invite = () => {
const lookup = (ev) => {
os.popupMenu([{
text: i18n.ts.user,
icon: 'fas fa-user',
icon: 'ph-user',
action: () => {
lookupUser();
},
}, {
text: i18n.ts.note,
icon: 'fas fa-pencil-alt',
icon: 'ph-pencil',
action: () => {
alert('TODO');
},
}, {
text: i18n.ts.file,
icon: 'fas fa-cloud',
icon: 'ph-cloud',
action: () => {
alert('TODO');
},
}, {
text: i18n.ts.instance,
icon: 'fas fa-globe',
icon: 'ph-planet',
action: () => {
alert('TODO');
},

View file

@ -8,7 +8,7 @@
<template #caption>{{ i18n.ts.blockedInstancesDescription }}</template>
</FormTextarea>
<FormButton primary class="_formBlock" @click="save"><i class="fas fa-save"></i> {{ i18n.ts.save }}</FormButton>
<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back"></i> {{ i18n.ts.save }}</FormButton>
</FormSuspense>
</MkSpacer>
</MkStickyContainer>
@ -46,6 +46,6 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.instanceBlocking,
icon: 'fas fa-ban',
icon: 'ph-prohibit',
});
</script>

View file

@ -9,17 +9,17 @@
<FormInfo class="_formBlock">Callback URL: {{ `${uri}/api/dc/cb` }}</FormInfo>
<FormInput v-model="discordClientId" class="_formBlock">
<template #prefix><i class="fas fa-key"></i></template>
<template #prefix><i class="ph-key"></i></template>
<template #label>Client ID</template>
</FormInput>
<FormInput v-model="discordClientSecret" class="_formBlock">
<template #prefix><i class="fas fa-key"></i></template>
<template #prefix><i class="ph-key"></i></template>
<template #label>Client Secret</template>
</FormInput>
</template>
<FormButton primary class="_formBlock" @click="save"><i class="fas fa-save"></i> {{ i18n.ts.save }}</FormButton>
<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back"></i> {{ i18n.ts.save }}</FormButton>
</div>
</FormSuspense>
</template>

View file

@ -9,17 +9,17 @@
<FormInfo class="_formBlock">Callback URL: {{ `${uri}/api/gh/cb` }}</FormInfo>
<FormInput v-model="githubClientId" class="_formBlock">
<template #prefix><i class="fas fa-key"></i></template>
<template #prefix><i class="ph-key"></i></template>
<template #label>Client ID</template>
</FormInput>
<FormInput v-model="githubClientSecret" class="_formBlock">
<template #prefix><i class="fas fa-key"></i></template>
<template #prefix><i class="ph-key"></i></template>
<template #label>Client Secret</template>
</FormInput>
</template>
<FormButton primary class="_formBlock" @click="save"><i class="fas fa-save"></i> {{ i18n.ts.save }}</FormButton>
<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back"></i> {{ i18n.ts.save }}</FormButton>
</div>
</FormSuspense>
</template>

View file

@ -9,17 +9,17 @@
<FormInfo class="_formBlock">Callback URL: {{ `${uri}/api/tw/cb` }}</FormInfo>
<FormInput v-model="twitterConsumerKey" class="_formBlock">
<template #prefix><i class="fas fa-key"></i></template>
<template #prefix><i class="ph-key"></i></template>
<template #label>Consumer Key</template>
</FormInput>
<FormInput v-model="twitterConsumerSecret" class="_formBlock">
<template #prefix><i class="fas fa-key"></i></template>
<template #prefix><i class="ph-key"></i></template>
<template #label>Consumer Secret</template>
</FormInput>
</template>
<FormButton primary class="_formBlock" @click="save"><i class="fas fa-save"></i> {{ i18n.ts.save }}</FormButton>
<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back"></i> {{ i18n.ts.save }}</FormButton>
</div>
</FormSuspense>
</template>

View file

@ -52,6 +52,6 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.integration,
icon: 'fas fa-share-alt',
icon: 'ph-share-network',
});
</script>

View file

@ -1,6 +1,6 @@
<template>
<div class="_debobigegoItem">
<div class="_debobigegoLabel"><i class="fas fa-microchip"></i> {{ $ts.cpuAndMemory }}</div>
<div class="_debobigegoLabel"><i class="ph-microchip"></i> {{ $ts.cpuAndMemory }}</div>
<div class="_debobigegoPanel xhexznfu">
<div>
<canvas :ref="cpumem"></canvas>
@ -17,7 +17,7 @@
</div>
</div>
<div class="_debobigegoItem">
<div class="_debobigegoLabel"><i class="fas fa-hdd"></i> {{ $ts.disk }}</div>
<div class="_debobigegoLabel"><i class="ph-hard-drives"></i> {{ $ts.disk }}</div>
<div class="_debobigegoPanel xhexznfu">
<div>
<canvas :ref="disk"></canvas>
@ -34,7 +34,7 @@
</div>
</div>
<div class="_debobigegoItem">
<div class="_debobigegoLabel"><i class="fas fa-exchange-alt"></i> {{ $ts.network }}</div>
<div class="_debobigegoLabel"><i class="ph-swap"></i> {{ $ts.network }}</div>
<div class="_debobigegoPanel xhexznfu">
<div>
<canvas :ref="net"></canvas>

View file

@ -34,12 +34,12 @@
<FormSplit :min-width="280">
<FormInput v-model="objectStorageAccessKey" class="_formBlock">
<template #prefix><i class="fas fa-key"></i></template>
<template #prefix><i class="ph-key"></i></template>
<template #label>Access key</template>
</FormInput>
<FormInput v-model="objectStorageSecretKey" class="_formBlock">
<template #prefix><i class="fas fa-key"></i></template>
<template #prefix><i class="ph-key"></i></template>
<template #label>Secret key</template>
</FormInput>
</FormSplit>
@ -134,7 +134,7 @@ function save() {
const headerActions = $computed(() => [{
asFullButton: true,
icon: 'fas fa-check',
icon: 'ph-check',
text: i18n.ts.save,
handler: save,
}]);
@ -143,6 +143,6 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.objectStorage,
icon: 'fas fa-cloud',
icon: 'ph-cloud',
});
</script>

View file

@ -30,7 +30,7 @@ function save() {
const headerActions = $computed(() => [{
asFullButton: true,
icon: 'fas fa-check',
icon: 'ph-check',
text: i18n.ts.save,
handler: save,
}]);
@ -39,6 +39,6 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.other,
icon: 'fas fa-cogs',
icon: 'ph-gear-six',
});
</script>

View file

@ -467,7 +467,7 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.dashboard,
icon: 'fas fa-tachometer-alt',
icon: 'ph-gauge',
});
</script>

View file

@ -57,6 +57,6 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.proxyAccount,
icon: 'fas fa-ghost',
icon: 'ph-ghost',
});
</script>

View file

@ -34,7 +34,7 @@ function clear() {
const headerActions = $computed(() => [{
asFullButton: true,
icon: 'fas fa-up-right-from-square',
icon: 'ph-arrow-square-up-right',
text: i18n.ts.dashboard,
handler: () => {
window.open(config.url + '/queue', '_blank');
@ -51,6 +51,6 @@ const headerTabs = $computed(() => [{
definePageMetadata({
title: i18n.ts.jobQueue,
icon: 'fas fa-clipboard-list',
icon: 'ph-clipboard-text',
});
</script>

View file

@ -5,12 +5,12 @@
<div v-for="relay in relays" :key="relay.inbox" class="relaycxt _panel _block" style="padding: 16px;">
<div>{{ relay.inbox }}</div>
<div class="status">
<i v-if="relay.status === 'accepted'" class="fas fa-check icon accepted"></i>
<i v-else-if="relay.status === 'rejected'" class="fas fa-ban icon rejected"></i>
<i v-else class="fas fa-clock icon requesting"></i>
<i v-if="relay.status === 'accepted'" class="ph-check icon accepted"></i>
<i v-else-if="relay.status === 'rejected'" class="ph-prohibit icon rejected"></i>
<i v-else class="ph-clock icon requesting"></i>
<span>{{ $t(`_relayStatus.${relay.status}`) }}</span>
</div>
<MkButton class="button" inline danger @click="remove(relay.inbox)"><i class="fas fa-trash-alt"></i> {{ i18n.ts.remove }}</MkButton>
<MkButton class="button" inline danger @click="remove(relay.inbox)"><i class="ph-trash"></i> {{ i18n.ts.remove }}</MkButton>
</div>
</MkSpacer>
</MkStickyContainer>
@ -68,7 +68,7 @@ refresh();
const headerActions = $computed(() => [{
asFullButton: true,
icon: 'fas fa-plus',
icon: 'ph-plus',
text: i18n.ts.addRelay,
handler: addRelay,
}]);
@ -77,7 +77,7 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.relays,
icon: 'fas fa-globe',
icon: 'ph-planet',
});
</script>

View file

@ -5,7 +5,7 @@
<FormSuspense :p="init">
<div class="_formRoot">
<FormFolder class="_formBlock">
<template #icon><i class="fas fa-shield-alt"></i></template>
<template #icon><i class="ph-robot"></i></template>
<template #label>{{ i18n.ts.botProtection }}</template>
<template v-if="enableHcaptcha" #suffix>hCaptcha</template>
<template v-else-if="enableRecaptcha" #suffix>reCAPTCHA</template>
@ -15,7 +15,7 @@
</FormFolder>
<FormFolder class="_formBlock">
<template #icon><i class="fas fa-eye-slash"></i></template>
<template #icon><i class="ph-eye-slash"></i></template>
<template #label>{{ i18n.ts.sensitiveMediaDetection }}</template>
<template v-if="sensitiveMediaDetection === 'all'" #suffix>{{ i18n.ts.all }}</template>
<template v-else-if="sensitiveMediaDetection === 'local'" #suffix>{{ i18n.ts.localOnly }}</template>
@ -53,7 +53,7 @@
</FormSwitch>
-->
<FormButton primary class="_formBlock" @click="save"><i class="fas fa-save"></i> {{ i18n.ts.save }}</FormButton>
<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back"></i> {{ i18n.ts.save }}</FormButton>
</div>
</FormFolder>
@ -87,11 +87,11 @@
<div class="_formRoot">
<FormInput v-model="summalyProxy" class="_formBlock">
<template #prefix><i class="fas fa-link"></i></template>
<template #prefix><i class="ph-link-simple"></i></template>
<template #label>Summaly Proxy URL</template>
</FormInput>
<FormButton primary class="_formBlock" @click="save"><i class="fas fa-save"></i> {{ i18n.ts.save }}</FormButton>
<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back"></i> {{ i18n.ts.save }}</FormButton>
</div>
</FormFolder>
@ -111,7 +111,7 @@
<template #label>{{ i18n.ts.allowedInstances }}</template>
<template #caption>{{ i18n.ts.allowedInstancesDescription }}</template>
</FormTextarea>
<FormButton primary class="_formBlock" @click="saveInstance"><i class="fas fa-save"></i> {{ i18n.ts.save }}</FormButton>
<FormButton primary class="_formBlock" @click="saveInstance"><i class="ph-floppy-disk-back"></i> {{ i18n.ts.save }}</FormButton>
</div>
</FormFolder>
</div>
@ -210,6 +210,6 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.security,
icon: 'fas fa-lock',
icon: 'ph-lock',
});
</script>

View file

@ -14,7 +14,7 @@
</FormTextarea>
<FormInput v-model="tosUrl" class="_formBlock">
<template #prefix><i class="fas fa-link"></i></template>
<template #prefix><i class="ph-link-simple"></i></template>
<template #label>{{ i18n.ts.tosUrl }}</template>
</FormInput>
@ -24,7 +24,7 @@
</FormInput>
<FormInput v-model="maintainerEmail" type="email" class="_formBlock">
<template #prefix><i class="fas fa-envelope"></i></template>
<template #prefix><i class="ph-envelope-simple-open"></i></template>
<template #label>{{ i18n.ts.maintainerEmail }}</template>
</FormInput>
</FormSplit>
@ -62,27 +62,27 @@
<template #label>{{ i18n.ts.theme }}</template>
<FormInput v-model="iconUrl" class="_formBlock">
<template #prefix><i class="fas fa-link"></i></template>
<template #prefix><i class="ph-link-simple"></i></template>
<template #label>{{ i18n.ts.iconUrl }}</template>
</FormInput>
<FormInput v-model="bannerUrl" class="_formBlock">
<template #prefix><i class="fas fa-link"></i></template>
<template #prefix><i class="ph-link-simple"></i></template>
<template #label>{{ i18n.ts.bannerUrl }}</template>
</FormInput>
<FormInput v-model="logoImageUrl" class="_formBlock">
<template #prefix><i class="fas fa-link"></i></template>
<template #prefix><i class="ph-link-simple"></i></template>
<template #label>{{ i18n.ts.logoImageUrl }}</template>
</FormInput>
<FormInput v-model="backgroundImageUrl" class="_formBlock">
<template #prefix><i class="fas fa-link"></i></template>
<template #prefix><i class="ph-link-simple"></i></template>
<template #label>{{ i18n.ts.backgroundImageUrl }}</template>
</FormInput>
<FormInput v-model="themeColor" class="_formBlock">
<template #prefix><i class="fas fa-palette"></i></template>
<template #prefix><i class="ph-palette"></i></template>
<template #label>{{ i18n.ts.themeColor }}</template>
<template #caption>#RRGGBB</template>
</FormInput>
@ -145,12 +145,12 @@
<template v-if="enableServiceWorker">
<FormInput v-model="swPublicKey" class="_formBlock">
<template #prefix><i class="fas fa-key"></i></template>
<template #prefix><i class="ph-key"></i></template>
<template #label>Public key</template>
</FormInput>
<FormInput v-model="swPrivateKey" class="_formBlock">
<template #prefix><i class="fas fa-key"></i></template>
<template #prefix><i class="ph-key"></i></template>
<template #label>Private key</template>
</FormInput>
</template>
@ -160,7 +160,7 @@
<template #label>DeepL Translation</template>
<FormInput v-model="deeplAuthKey" class="_formBlock">
<template #prefix><i class="fas fa-key"></i></template>
<template #prefix><i class="ph-key"></i></template>
<template #label>DeepL Auth Key</template>
</FormInput>
<FormSwitch v-model="deeplIsPro" class="_formBlock">
@ -290,7 +290,7 @@ function save() {
const headerActions = $computed(() => [{
asFullButton: true,
icon: 'fas fa-check',
icon: 'ph-check',
text: i18n.ts.save,
handler: save,
}]);
@ -299,6 +299,6 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.general,
icon: 'fas fa-cog',
icon: 'ph-gear-six',
});
</script>

View file

@ -115,17 +115,17 @@ function show(user) {
}
const headerActions = $computed(() => [{
icon: 'fas fa-search',
icon: 'ph-magnifying-glass',
text: i18n.ts.search,
handler: searchUser,
}, {
asFullButton: true,
icon: 'fas fa-plus',
icon: 'ph-plus',
text: i18n.ts.addUser,
handler: addUser,
}, {
asFullButton: true,
icon: 'fas fa-search',
icon: 'ph-magnifying-glass',
text: i18n.ts.lookup,
handler: lookupUser,
}]);
@ -134,7 +134,7 @@ const headerTabs = $computed(() => []);
definePageMetadata(computed(() => ({
title: i18n.ts.users,
icon: 'fas fa-users',
icon: 'ph-users',
})));
</script>

View file

@ -10,7 +10,7 @@
<img v-if="announcement.imageUrl" :src="announcement.imageUrl"/>
</div>
<div v-if="$i && !announcement.isRead" class="_footer">
<MkButton primary @click="read(items, announcement, i)"><i class="fas fa-check"></i> {{ $ts.gotIt }}</MkButton>
<MkButton primary @click="read(items, announcement, i)"><i class="ph-check"></i> {{ $ts.gotIt }}</MkButton>
</div>
</section>
</MkPagination>
@ -46,7 +46,7 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.announcements,
icon: 'fas fa-broadcast-tower',
icon: 'ph-megaphone-simple',
});
</script>

Some files were not shown because too many files have changed in this diff Show more