oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

Merge branch 'MisskeyIO:io' into oscar

Browse source
This commit is contained in:
オスカー、 2024-07-30 22:42:59 +09:00 • committed by GitHub
commit 2ebb0b5455
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/frontend/src/components/MkNote.vue
View file

@ -121,7 +121,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<button ref="reactButton" :class="$style.footerButton" class="_button" @click="toggleReact()">
<i v-if=" (appearNote.reactionAcceptance === 'likeOnly' || !$i?.policies.canUseReaction) && appearNote.myReaction != null " class="ti ti-heart-filled" style="color: var(--eventReactionHeart);"></i>
<i v-else-if="appearNote.myReaction != null " class="ti ti-minus" style="color: var(--accent);"></i>
<i v-else-if="appearNote.reactionAcceptance === 'likeOnly' || !$i?.policies.canUseReaction" class="ti ti-heart"></i>
<i v-else-if="appearNote.reactionAcceptance === 'likeOnly' || $i && !$i.policies.canUseReaction" class="ti ti-heart"></i>
<i v-else class="ti ti-plus"></i>
<p v-if="(appearNote.reactionAcceptance === 'likeOnly' || defaultStore.state.showReactionsCount) && appearNote.reactionCount > 0" :class="$style.footerButtonCount">{{ number(appearNote.reactionCount) }}</p>
</button>

2
packages/frontend/src/components/MkNoteDetailed.vue
View file

@ -129,7 +129,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<button ref="reactButton" :class="$style.noteFooterButton" class="_button" @click="toggleReact()">
<i v-if=" (appearNote.reactionAcceptance === 'likeOnly' || !$i?.policies.canUseReaction) && appearNote.myReaction != null " class="ti ti-heart-filled" style="color: var(--eventReactionHeart);"></i>
<i v-else-if="appearNote.myReaction != null " class="ti ti-minus" style="color: var(--accent);"></i>
<i v-else-if="appearNote.reactionAcceptance === 'likeOnly' || !$i?.policies.canUseReaction" class="ti ti-heart"></i>
<i v-else-if="appearNote.reactionAcceptance === 'likeOnly' || $i && !$i.policies.canUseReaction" class="ti ti-heart"></i>
<i v-else class="ti ti-plus"></i>
<p v-if="(appearNote.reactionAcceptance === 'likeOnly' || defaultStore.state.showReactionsCount) && appearNote.reactionCount > 0" :class="$style.noteFooterButtonCount">{{ number(appearNote.reactionCount) }}</p>
</button>

1
packages/frontend/src/components/MkReactionsViewer.details.vue
View file

@ -81,6 +81,7 @@ function getReactionName(reaction: string): string {
}
.user {
display: flex;
line-height: 24px;
padding-top: 4px;
white-space: nowrap;

1
packages/frontend/src/pages/search.user.vue
View file

@ -69,6 +69,7 @@ async function search() {
userPagination.value = {
endpoint: 'users/search',
limit: 10,
offsetMode: true,
params: {
query: query,
origin: searchOrigin.value,

1
packages/frontend/vite.config.local-dev.ts
View file

@ -52,6 +52,7 @@ const devConfig = {
'/bios': httpUrl,
'/cli': httpUrl,
'/inbox': httpUrl,
'/emoji/': httpUrl,
'/notes': {
target: httpUrl,
headers: {