e2net/iceshrimp-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

Fix icons + formatting

Browse source
This commit is contained in:
ThatOneCalculator 2022-12-06 20:12:44 -08:00
parent 70d9b3b45d
commit 76c4f17017
7 changed files with 37 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "calckey", "name": "calckey",
"version": "13.0.0-b4", "version": "13.0.0-b5",
"codename": "aqua", "codename": "aqua",
"repository": { "repository": {
"type": "git", "type": "git",

2
packages/client/src/components/MkInfo.vue
View file

@ -9,7 +9,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { } from 'vue'; import { } from 'vue';
const props = defineProps<{ defineProps<{
warn?: boolean; warn?: boolean;
}>(); }>();
</script> </script>

15
packages/client/src/components/MkMoved.vue
View file

@ -1,23 +1,28 @@
<template> <template>
<div class="_block" :class="$style.mkmoved"><i class="fas fa-info-circle" style="margin-right: 8px;"></i>{{ i18n.ts.accountMoved }}<MkMention :class="$style.link" class="link" :username="acct" :host="host"/></div> <div class="_block msjugskdqo">
<i class="ph-airplane-takeoff-bold ph-lg" style="margin-right: 8px;"/>
{{ i18n.ts.accountMoved }}
<MkMention :class="$style.link" class="link" :username="acct" :host="host"/>
</div>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { i18n } from '@/i18n';
import MkMention from './MkMention.vue'; import MkMention from './MkMention.vue';
const props = defineProps<{ import { i18n } from '@/i18n';
defineProps<{
acct: string; acct: string;
host: string; host: string;
}>(); }>();
const href = $computed(() => `/${props.acct}`);
</script> </script>
<style lang="scss" module> <style lang="scss" module>
.mkmoved { .msjugskdqo {
font-size: 0.8em; font-size: 0.8em;
padding: 16px; padding: 16px;
background: var(--infoBg); background: var(--infoBg);
color: var(--infoFg); color: var(--infoFg);
> .link { > .link {
margin-left: 4px; margin-left: 4px;
color: var(--accent); color: var(--accent);

24
packages/client/src/pages/admin/proxy-account.vue
View file

@ -1,16 +1,18 @@
<template><MkStickyContainer> <template>
<MkStickyContainer>
<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template> <template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
<MkSpacer :content-max="700" :margin-min="16" :margin-max="32"> <MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
<FormSuspense :p="init"> <FormSuspense :p="init">
<MkInfo class="_formBlock">{{ i18n.ts.proxyAccountDescription }}</MkInfo> <MkInfo class="_formBlock">{{ i18n.ts.proxyAccountDescription }}</MkInfo>
<MkKeyValue class="_formBlock"> <MkKeyValue class="_formBlock">
<template #key>{{ i18n.ts.proxyAccount }}</template> <template #key>{{ i18n.ts.proxyAccount }}</template>
<template #value>{{ proxyAccount ? `@${proxyAccount.username}` : i18n.ts.none }}</template> <template #value>{{ proxyAccount ? `@${proxyAccount.username}` : i18n.ts.none }}</template>
</MkKeyValue> </MkKeyValue>
<FormButton primary class="_formBlock" @click="chooseProxyAccount">{{ i18n.ts.selectAccount }}</FormButton> <FormButton primary class="_formBlock" @click="chooseProxyAccount">{{ i18n.ts.selectAccount }}</FormButton>
</FormSuspense> </FormSuspense>
</MkSpacer></MkStickyContainer> </MkSpacer>
</MkStickyContainer>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>

18
packages/client/src/pages/explore.users.vue
View file

@ -9,26 +9,26 @@
<div v-if="origin === 'local'"> <div v-if="origin === 'local'">
<template v-if="tag == null"> <template v-if="tag == null">
<MkFolder class="_gap" persist-key="explore-pinned-users"> <MkFolder class="_gap" persist-key="explore-pinned-users">
<template #header><i class="fas fa-bookmark fa-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.pinnedUsers }}</template> <template #header><i class="ph-bookmark-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.pinnedUsers }}</template>
<XUserList :pagination="pinnedUsers"/> <XUserList :pagination="pinnedUsers"/>
</MkFolder> </MkFolder>
<MkFolder v-if="$i != null" class="_gap" persist-key="explore-popular-users"> <MkFolder v-if="$i != null" class="_gap" persist-key="explore-popular-users">
<template #header><i class="fas fa-chart-line fa-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularUsers }}</template> <template #header><i class="ph-chart-line-up-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularUsers }}</template>
<XUserList :pagination="popularUsers"/> <XUserList :pagination="popularUsers"/>
</MkFolder> </MkFolder>
<MkFolder v-if="$i != null" class="_gap" persist-key="explore-recently-updated-users"> <MkFolder v-if="$i != null" class="_gap" persist-key="explore-recently-updated-users">
<template #header><i class="fas fa-comment-alt fa-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyUpdatedUsers }}</template> <template #header><i class="ph-activity-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyUpdatedUsers }}</template>
<XUserList :pagination="recentlyUpdatedUsers"/> <XUserList :pagination="recentlyUpdatedUsers"/>
</MkFolder> </MkFolder>
<MkFolder v-if="$i != null" class="_gap" persist-key="explore-recently-registered-users"> <MkFolder v-if="$i != null" class="_gap" persist-key="explore-recently-registered-users">
<template #header><i class="fas fa-plus fa-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyRegisteredUsers }}</template> <template #header><i class="ph-butterfly-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyRegisteredUsers }}</template>
<XUserList :pagination="recentlyRegisteredUsers"/> <XUserList :pagination="recentlyRegisteredUsers"/>
</MkFolder> </MkFolder>
</template> </template>
</div> </div>
<div v-else> <div v-else>
<MkFolder ref="tagsEl" :foldable="true" :expanded="false" class="_gap"> <MkFolder ref="tagsEl" :foldable="true" :expanded="false" class="_gap">
<template #header><i class="fas fa-hashtag fa-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularTags }}</template> <template #header><i class="ph-hash-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularTags }}</template>
<div class="vxjfqztj"> <div class="vxjfqztj">
<MkA v-for="tag in tagsLocal" :key="'local:' + tag.tag" :to="`/explore/tags/${tag.tag}`" class="local">{{ tag.tag }}</MkA> <MkA v-for="tag in tagsLocal" :key="'local:' + tag.tag" :to="`/explore/tags/${tag.tag}`" class="local">{{ tag.tag }}</MkA>
@ -37,21 +37,21 @@
</MkFolder> </MkFolder>
<MkFolder v-if="tag != null" :key="`${tag}`" class="_gap"> <MkFolder v-if="tag != null" :key="`${tag}`" class="_gap">
<template #header><i class="fas fa-hashtag fa-fw" style="margin-right: 0.5em;"></i>{{ tag }}</template> <template #header><i class="ph-hash-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ tag }}</template>
<XUserList :pagination="tagUsers"/> <XUserList :pagination="tagUsers"/>
</MkFolder> </MkFolder>
<template v-if="tag == null && $i != null"> <template v-if="tag == null && $i != null">
<MkFolder class="_gap"> <MkFolder class="_gap">
<template #header><i class="fas fa-chart-line fa-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularUsers }}</template> <template #header><i class="ph-chart-line-up-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularUsers }}</template>
<XUserList :pagination="popularUsersF"/> <XUserList :pagination="popularUsersF"/>
</MkFolder> </MkFolder>
<MkFolder class="_gap"> <MkFolder class="_gap">
<template #header><i class="fas fa-comment-alt fa-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyUpdatedUsers }}</template> <template #header><i class="ph-activity-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyUpdatedUsers }}</template>
<XUserList :pagination="recentlyUpdatedUsersF"/> <XUserList :pagination="recentlyUpdatedUsersF"/>
</MkFolder> </MkFolder>
<MkFolder class="_gap"> <MkFolder class="_gap">
<template #header><i class="fas fa-rocket fa-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyDiscoveredUsers }}</template> <template #header><i class="ph-rocke-launch-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyDiscoveredUsers }}</template>
<XUserList :pagination="recentlyRegisteredUsersF"/> <XUserList :pagination="recentlyRegisteredUsersF"/>
</MkFolder> </MkFolder>
</template> </template>

4
packages/client/src/pages/messaging/index.vue
View file

@ -130,11 +130,11 @@ function onRead(ids): void {
function startMenu(ev) { function startMenu(ev) {
os.popupMenu([{ os.popupMenu([{
text: i18n.ts.messagingWithUser, text: i18n.ts.messagingWithUser,
icon: 'fas fa-user', icon: 'ph-user-bold ph-lg',
action: () => { startUser(); }, action: () => { startUser(); },
}, { }, {
text: i18n.ts.messagingWithGroup, text: i18n.ts.messagingWithGroup,
icon: 'fas fa-users', icon: 'ph-users-three-bold ph-lg',
action: () => { startGroup(); }, action: () => { startGroup(); },
}], ev.currentTarget ?? ev.target); }], ev.currentTarget ?? ev.target);
} }

2
packages/client/src/pages/user/index.vue
View file

@ -112,7 +112,7 @@ definePageMetadata(
computed(() => computed(() =>
user user
? { ? {
icon: 'fas fa-user', icon: 'ph-user-bold ph-lg',
title: user.name title: user.name
? `${user.name} (@${user.username})` ? `${user.name} (@${user.username})`
: `@${user.username}`, : `@${user.username}`,