natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Revert footer changes

This commit is contained in:
Freeplay 2023-02-20 13:30:15 -05:00
parent 514cc3d8d2
commit 294d940800
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/client/src/components/MkNoteFooter.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<footer ref="el" class="footer" @click.stop.prevent> <footer ref="el" class="footer" @click.stop.prevent>
<XReactionsViewer v-if="!conversation" ref="reactionsViewer" :note="appearNote"/> <XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()"> <button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
<template v-if="appearNote.reply"><i class="ph-arrow-u-up-left-bold ph-lg"></i></template> <template v-if="appearNote.reply"><i class="ph-arrow-u-up-left-bold ph-lg"></i></template>
<template v-else><i class="ph-arrow-bend-up-left-bold ph-lg"></i></template> <template v-else><i class="ph-arrow-bend-up-left-bold ph-lg"></i></template>
@ -18,7 +18,6 @@
<button ref="menuButton" v-tooltip.noDelay.bottom="i18n.ts.more" class="button _button" @click="menu()"> <button ref="menuButton" v-tooltip.noDelay.bottom="i18n.ts.more" class="button _button" @click="menu()">
<i class="ph-dots-three-outline-bold ph-lg"></i> <i class="ph-dots-three-outline-bold ph-lg"></i>
</button> </button>
<XReactionsViewer v-if="conversation" ref="reactionsViewer" :note="appearNote"/>
</footer> </footer>
</template> </template>
@ -41,7 +40,6 @@ import { useNoteCapture } from '@/scripts/use-note-capture';
const props = defineProps<{ const props = defineProps<{
note: misskey.entities.Note; note: misskey.entities.Note;
conversation?: misskey.entities.Note[];
}>(); }>();
let note = $ref(deepClone(props.note)); let note = $ref(deepClone(props.note));

3
packages/client/src/components/MkNoteSub.vue
View File

@ -17,7 +17,7 @@
<MkSubNoteContent class="text" :note="note" :detailed="true"/> <MkSubNoteContent class="text" :note="note" :detailed="true"/>
</div> </div>
</div> </div>
<MkNoteFooter :note="note" :conversation="conversation"></MkNoteFooter> <MkNoteFooter :note="note"></MkNoteFooter>
</div> </div>
</div> </div>
<template v-if="conversation"> <template v-if="conversation">
@ -65,7 +65,6 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
<style lang="scss" scoped> <style lang="scss" scoped>
.wrpstxzv { .wrpstxzv {
padding: 16px 32px; padding: 16px 32px;
// --divider: rgba(255,255,255,0.5); // for now
&.children { &.children {
padding: 10px 0 0 var(--indent); padding: 10px 0 0 var(--indent);

7
packages/client/src/components/MkReactionsViewer.vue
View File

@ -21,11 +21,10 @@ const isMe = computed(() => $i && $i.id === props.note.userId);
<style lang="scss" scoped> <style lang="scss" scoped>
.tdflqwzn { .tdflqwzn {
margin: 0px -2px 0 -2px; margin-inline: -2px;
margin-top: .2em;
width: 100%; width: 100%;
.reply & {
width: auto;
}
&:empty { &:empty {
display: none; display: none;
} }

14
packages/client/src/components/MkSubNoteContent.vue
View File

@ -5,13 +5,13 @@
<MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="ph-arrow-bend-up-left-bold ph-lg"></i></MkA> <MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="ph-arrow-bend-up-left-bold ph-lg"></i></MkA>
<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :custom-emojis="note.emojis"/> <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}`">{{ i18n.ts.quoteAttached }}: ...</MkA> <MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">{{ i18n.ts.quoteAttached }}: ...</MkA>
<template v-if="detailed">
<!-- <div v-if="note.renoteId" class="renote">
<XNoteSimple :note="note.renote"/>
</div> -->
<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
</template>
</div> </div>
<template v-if="detailed">
<!-- <div v-if="note.renoteId" class="renote">
<XNoteSimple :note="note.renote"/>
</div> -->
<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
</template>
<div v-if="note.files.length > 0"> <div v-if="note.files.length > 0">
<XMediaList :media-list="note.files"/> <XMediaList :media-list="note.files"/>
</div> </div>
@ -58,7 +58,7 @@ const urls = props.note.text ? extractUrlFromMfm(mfm.parse(props.note.text)) : n
<style lang="scss" scoped> <style lang="scss" scoped>
.wrmlmaau { .wrmlmaau {
overflow-wrap: break-word; overflow-wrap: break-word;
> .body { > .body {
> .reply { > .reply {
margin-right: 6px; margin-right: 6px;