merge: develop

This commit is contained in:
Mar0xy 2023-11-04 21:52:12 +01:00
commit db29a5c2da
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
134 changed files with 282 additions and 282 deletions

View file

@ -42,7 +42,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
<div class="_buttonsCenter" style="margin-top: 16px;">
<MkButton rounded @click="cancel">{{ i18n.ts.cancel }}</MkButton>
<MkButton primary rounded gradate @click="page++">{{ i18n.ts.continue }} <i class="ph-arrow-right ph-bold pg-lg"></i></MkButton>
<MkButton primary rounded gradate @click="page++">{{ i18n.ts.continue }} <i class="ph-arrow-right ph-bold ph-lg"></i></MkButton>
</div>
</MkSpacer>
</div>
@ -56,8 +56,8 @@ SPDX-License-Identifier: AGPL-3.0-only
<div>{{ i18n.ts._2fa.step3 }}</div>
</div>
<div class="_buttonsCenter" style="margin-top: 16px;">
<MkButton rounded @click="page--"><i class="ph-arrow-left ph-bold pg-lg"></i> {{ i18n.ts.goBack }}</MkButton>
<MkButton primary rounded gradate @click="tokenDone">{{ i18n.ts.continue }} <i class="ph-arrow-right ph-bold pg-lg"></i></MkButton>
<MkButton rounded @click="page--"><i class="ph-arrow-left ph-bold ph-lg"></i> {{ i18n.ts.goBack }}</MkButton>
<MkButton primary rounded gradate @click="tokenDone">{{ i18n.ts.continue }} <i class="ph-arrow-right ph-bold ph-lg"></i></MkButton>
</div>
</MkSpacer>
</div>

View file

@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="_gaps">
<div class="_buttons">
<MkButton primary @click="addAccount"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.addAccount }}</MkButton>
<MkButton @click="init"><i class="ph-arrows-counter-clockwise ph-bold pg-lg"></i> {{ i18n.ts.reloadAccountsList }}</MkButton>
<MkButton @click="init"><i class="ph-arrows-counter-clockwise ph-bold ph-lg"></i> {{ i18n.ts.reloadAccountsList }}</MkButton>
</div>
<MkUserCardMini v-for="user in accounts" :key="user.id" :user="user" :class="$style.user" @click.prevent="menu(user, $event)"/>
@ -107,7 +107,7 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.accounts,
icon: 'ph-users ph-bold pg-lg',
icon: 'ph-users ph-bold ph-lg',
});
</script>

View file

@ -46,6 +46,6 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: 'API',
icon: 'ph-webhooks-logo ph-bold pg-lg',
icon: 'ph-webhooks-logo ph-bold ph-lg',
});
</script>

View file

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

View file

@ -189,7 +189,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
</MkFolder>
<FormLink to="/settings/deck">{{ i18n.ts.deck }}</FormLink>
<FormLink to="/settings/custom-css"><template #icon><i class="ph-code ph-bold pg-lg"></i></template>{{ i18n.ts.customCss }}</FormLink>
<FormLink to="/settings/custom-css"><template #icon><i class="ph-code ph-bold ph-lg"></i></template>{{ i18n.ts.customCss }}</FormLink>
</div>
</FormSection>
</div>

View file

@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkFolder>
</FormSection>
<FormSection>
<template #label><i class="ph-star ph-bold pg-lg"></i> {{ i18n.ts._exportOrImport.favoritedNotes }}</template>
<template #label><i class="ph-star ph-bold ph-lg"></i> {{ i18n.ts._exportOrImport.favoritedNotes }}</template>
<MkFolder>
<template #label>{{ i18n.ts.export }}</template>
<template #icon><i class="ph-download ph-bold ph-lg"></i></template>
@ -22,7 +22,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkFolder>
</FormSection>
<FormSection>
<template #label><i class="ph-users ph-bold pg-lg"></i> {{ i18n.ts._exportOrImport.followingList }}</template>
<template #label><i class="ph-users ph-bold ph-lg"></i> {{ i18n.ts._exportOrImport.followingList }}</template>
<div class="_gaps_s">
<MkFolder>
<template #label>{{ i18n.ts.export }}</template>
@ -48,7 +48,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
</FormSection>
<FormSection>
<template #label><i class="ph-users ph-bold pg-lg"></i> {{ i18n.ts._exportOrImport.userLists }}</template>
<template #label><i class="ph-users ph-bold ph-lg"></i> {{ i18n.ts._exportOrImport.userLists }}</template>
<div class="_gaps_s">
<MkFolder>
<template #label>{{ i18n.ts.export }}</template>
@ -93,7 +93,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
</FormSection>
<FormSection>
<template #label><i class="ph-flying-saucer ph-bold pg-lg"></i> {{ i18n.ts.antennas }}</template>
<template #label><i class="ph-flying-saucer ph-bold ph-lg"></i> {{ i18n.ts.antennas }}</template>
<div class="_gaps_s">
<MkFolder>
<template #label>{{ i18n.ts.export }}</template>

View file

@ -42,7 +42,7 @@ import { fetchCustomEmojis } from '@/custom-emojis.js';
const indexInfo = {
title: i18n.ts.settings,
icon: 'ph-gear ph-bold pg-lg',
icon: 'ph-gear ph-bold ph-lg',
hideHeader: true,
};
const INFO = ref(indexInfo);
@ -84,7 +84,7 @@ const menuDef = computed(() => [{
to: '/settings/drive',
active: currentPage?.route.name === 'drive',
}, {
icon: 'ph-bell ph-bold pg-lg',
icon: 'ph-bell ph-bold ph-lg',
text: i18n.ts.notifications,
to: '/settings/notifications',
active: currentPage?.route.name === 'notifications',
@ -122,7 +122,7 @@ const menuDef = computed(() => [{
to: '/settings/statusbar',
active: currentPage?.route.name === 'statusbar',
}, {
icon: 'ph-music-notes ph-bold pg-lg',
icon: 'ph-music-notes ph-bold ph-lg',
text: i18n.ts.sounds,
to: '/settings/sounds',
active: currentPage?.route.name === 'sounds',
@ -135,7 +135,7 @@ const menuDef = computed(() => [{
}, {
title: i18n.ts.otherSettings,
items: [{
icon: 'ph-seal-check ph-bold pg-lg',
icon: 'ph-seal-check ph-bold ph-lg',
text: i18n.ts.roles,
to: '/settings/roles',
active: currentPage?.route.name === 'roles',
@ -145,7 +145,7 @@ const menuDef = computed(() => [{
to: '/settings/mute-block',
active: currentPage?.route.name === 'mute-block',
}, {
icon: 'ph-key ph-bold pg-lg',
icon: 'ph-key ph-bold ph-lg',
text: 'API',
to: '/settings/api',
active: currentPage?.route.name === 'api',
@ -172,7 +172,7 @@ const menuDef = computed(() => [{
}],
}, {
items: [{
icon: 'ph-floppy-disk ph-bold pg-lg',
icon: 'ph-floppy-disk ph-bold ph-lg',
text: i18n.ts.preferencesBackups,
to: '/settings/preferences-backups',
active: currentPage?.route.name === 'preferences-backups',

View file

@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #label>{{ i18n.ts._instanceMute.heading }}</template>
<template #caption>{{ i18n.ts._instanceMute.instanceMuteDescription }}<br>{{ i18n.ts._instanceMute.instanceMuteDescription2 }}</template>
</MkTextarea>
<MkButton primary :disabled="!changed" @click="save()"><i class="ph-floppy-disk ph-bold pg-lg"></i> {{ i18n.ts.save }}</MkButton>
<MkButton primary :disabled="!changed" @click="save()"><i class="ph-floppy-disk ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
</div>
</template>

View file

@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #caption>{{ i18n.ts._wordMute.muteWordsDescription }}<br>{{ i18n.ts._wordMute.muteWordsDescription2 }}</template>
</MkTextarea>
</div>
<MkButton primary inline :disabled="!changed" @click="save()"><i class="ph-floppy-disk ph-bold pg-lg"></i> {{ i18n.ts.save }}</MkButton>
<MkButton primary inline :disabled="!changed" @click="save()"><i class="ph-floppy-disk ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
</div>
</template>

View file

@ -32,7 +32,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="_buttons">
<MkButton @click="addItem"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.addItem }}</MkButton>
<MkButton danger @click="reset"><i class="ph-arrow-clockwise ph-bold ph-lg"></i> {{ i18n.ts.default }}</MkButton>
<MkButton primary class="save" @click="save"><i class="ph-floppy-disk ph-bold pg-lg"></i> {{ i18n.ts.save }}</MkButton>
<MkButton primary class="save" @click="save"><i class="ph-floppy-disk ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
</div>
<MkRadios v-model="menuDisplay">
@ -121,7 +121,7 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.navbar,
icon: 'ph-list ph-bold pg-lg',
icon: 'ph-list ph-bold ph-lg',
});
</script>

View file

@ -114,6 +114,6 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.notifications,
icon: 'ph-bell ph-bold pg-lg',
icon: 'ph-bell ph-bold ph-lg',
});
</script>

View file

@ -58,7 +58,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkFolder>
<MkFolder>
<template #icon><i class="ph-code ph-bold pg-lg"></i></template>
<template #icon><i class="ph-code ph-bold ph-lg"></i></template>
<template #label>{{ i18n.ts.developer }}</template>
<div class="_gaps_m">

View file

@ -37,12 +37,12 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
<div class="_buttons">
<MkButton v-if="plugin.config" inline @click="config(plugin)"><i class="ph-gear ph-bold pg-lg"></i> {{ i18n.ts.settings }}</MkButton>
<MkButton v-if="plugin.config" inline @click="config(plugin)"><i class="ph-gear ph-bold ph-lg"></i> {{ i18n.ts.settings }}</MkButton>
<MkButton inline danger @click="uninstall(plugin)"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.uninstall }}</MkButton>
</div>
<MkFolder>
<template #icon><i class="ph-code ph-bold pg-lg"></i></template>
<template #icon><i class="ph-code ph-bold ph-lg"></i></template>
<template #label>{{ i18n.ts._plugin.viewSource }}</template>
<div class="_gaps_s">

View file

@ -400,7 +400,7 @@ function menu(ev: MouseEvent, profileId: string) {
action: () => rename(profileId),
}, {
text: ts._preferencesBackups.save,
icon: 'ph-floppy-disk ph-bold pg-lg',
icon: 'ph-floppy-disk ph-bold ph-lg',
action: () => save(profileId),
}, null, {
text: ts.delete,
@ -426,7 +426,7 @@ onUnmounted(() => {
definePageMetadata(computed(() => ({
title: ts.preferencesBackups,
icon: 'ph-floppy-disk ph-bold pg-lg',
icon: 'ph-floppy-disk ph-bold ph-lg',
})));
</script>

View file

@ -45,7 +45,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<FormSlot>
<MkFolder>
<template #icon><i class="ph-list ph-bold pg-lg"></i></template>
<template #icon><i class="ph-list ph-bold ph-lg"></i></template>
<template #label>{{ i18n.ts._profile.metadataEdit }}</template>
<div :class="$style.metadataRoot">
@ -90,7 +90,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</FormSlot>
<MkFolder>
<template #icon><i class="ph-sparkle ph-bold pg-lg"></i></template>
<template #icon><i class="ph-sparkle ph-bold ph-lg"></i></template>
<template #label>{{ i18n.ts.avatarDecorations }}</template>
<div style="display: grid; grid-template-columns: repeat(auto-fill, minmax(140px, 1fr)); grid-gap: 12px;">

View file

@ -52,7 +52,7 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.roles,
icon: 'ph-seal-check ph-bold pg-lg',
icon: 'ph-seal-check ph-bold ph-lg',
});
</script>

View file

@ -32,7 +32,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<FormSection>
<FormSlot>
<MkButton danger @click="regenerateToken"><i class="ph-arrows-counter-clockwise ph-bold pg-lg"></i> {{ i18n.ts.regenerateLoginToken }}</MkButton>
<MkButton danger @click="regenerateToken"><i class="ph-arrows-counter-clockwise ph-bold ph-lg"></i> {{ i18n.ts.regenerateLoginToken }}</MkButton>
<template #caption>{{ i18n.ts.regenerateLoginTokenDescription }}</template>
</FormSlot>
</FormSection>

View file

@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkRange>
<div class="_buttons">
<MkButton inline @click="listen"><i class="ph-play ph-bold pg-lg"></i> {{ i18n.ts.listen }}</MkButton>
<MkButton inline @click="listen"><i class="ph-play ph-bold ph-lg"></i> {{ i18n.ts.listen }}</MkButton>
<MkButton inline primary @click="save"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
</div>
</div>

View file

@ -72,6 +72,6 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.sounds,
icon: 'ph-music-notes ph-bold pg-lg',
icon: 'ph-music-notes ph-bold ph-lg',
});
</script>

View file

@ -51,6 +51,6 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.statusbar,
icon: 'ph-list ph-bold pg-lg',
icon: 'ph-list ph-bold ph-lg',
});
</script>