profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into fix-msg-room

Browse source
This commit is contained in:
tamaina 2022-02-02 14:07:17 +09:00
commit 9061d33405
5 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/client/src/components/reactions-viewer.reaction.vue
View file

@ -101,7 +101,7 @@ export default defineComponent({
emojis: props.note.emojis,
users,
count: props.count,
source: buttonRef.value
targetElement: buttonRef.value,
}, {}, 'closed');
});

2
packages/client/src/components/renote-button.vue
View file

@ -52,7 +52,7 @@ export default defineComponent({
showing,
users,
count: props.count,
source: buttonRef.value
targetElement: buttonRef.value
}, {}, 'closed');
});

7
packages/client/src/pages/federation.vue
View file

@ -115,7 +115,7 @@ const pagination = {
offsetMode: true,
params: computed(() => ({
sort: sort,
host: host != '' ? host : null,
host: host !== '' ? host : null,
...(
state === 'federating' ? { federating: true } :
state === 'subscribing' ? { subscribing: true } :
@ -157,11 +157,10 @@ defineExpose({
> .instance {
padding: 16px;
border: solid 1px var(--divider);
border-radius: 6px;
background: var(--panel);
border-radius: 8px;
&:hover {
border: solid 1px var(--accent);
text-decoration: none;
}