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

Merge pull request '[Feature] hover text in note buttons' (#9146) from yawhn/elreqkey:hover_text_in_note into develop 

Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9146
This commit is contained in:
Kainoa Kanter 2022-11-27 05:34:50 +00:00
parent 64bb6497c5 4b3006bead
commit bb88f2cdc5
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/client/src/components/MkNote.vue
View File

@ -71,21 +71,21 @@
</div> </div>
<footer class="footer"> <footer class="footer">
<XReactionsViewer ref="reactionsViewer" :note="appearNote"/> <XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
<button class="button _button" @click="reply()"> <button class="button _button" v-tooltip.noDelay.bottom="i18n.ts.reply" @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>
<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p> <p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p>
</button> </button>
<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/> <XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/> <XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
<button v-if="appearNote.myReaction == null" ref="reactButton" class="button _button" @click="react()"> <button v-if="appearNote.myReaction == null" ref="reactButton" class="button _button" v-tooltip.noDelay.bottom="i18n.ts.reaction" @click="react()">
<i class="ph-smiley-bold ph-lg"></i> <i class="ph-smiley-bold ph-lg"></i>
</button> </button>
<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)"> <button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
<i class="ph-minus-bold ph-lg"></i> <i class="ph-minus-bold ph-lg"></i>
</button> </button>
<XQuoteButton class="button" :note="appearNote"/> <XQuoteButton class="button" :note="appearNote"/>
<button ref="menuButton" class="button _button" @click="menu()"> <button ref="menuButton" class="button _button" v-tooltip.noDelay.bottom="i18n.ts.more" @click="menu()">
<i class="ph-dots-three-outline-bold ph-lg"></i> <i class="ph-dots-three-outline-bold ph-lg"></i>
</button> </button>
</footer> </footer>

6
packages/client/src/components/MkNoteDetailed.vue
View File

@ -81,21 +81,21 @@
</MkA> </MkA>
</div> </div>
<XReactionsViewer ref="reactionsViewer" :note="appearNote"/> <XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
<button class="button _button" @click="reply()"> <button class="button _button" v-tooltip.noDelay.bottom="i18n.ts.reply" @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>
<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p> <p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p>
</button> </button>
<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/> <XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/> <XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
<button v-if="appearNote.myReaction == null" ref="reactButton" class="button _button" @click="react()"> <button v-if="appearNote.myReaction == null" ref="reactButton" class="button _button" v-tooltip.noDelay.bottom="i18n.ts.reaction" @click="react()">
<i class="ph-smiley-bold ph-lg"></i> <i class="ph-smiley-bold ph-lg"></i>
</button> </button>
<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)"> <button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
<i class="ph-minus-bold ph-lg"></i> <i class="ph-minus-bold ph-lg"></i>
</button> </button>
<XQuoteButton class="button" :note="appearNote"/> <XQuoteButton class="button" :note="appearNote"/>
<button ref="menuButton" class="button _button" @click="menu()"> <button ref="menuButton" class="button _button" v-tooltip.noDelay.bottom="i18n.ts.more" @click="menu()">
<i class="ph-dots-three-outline-bold ph-lg"></i> <i class="ph-dots-three-outline-bold ph-lg"></i>
</button> </button>
</footer> </footer>

2
packages/client/src/components/MkQuoteButton.vue
View File

@ -2,6 +2,7 @@
<button <button
v-if="canRenote && $store.state.seperateRenoteQuote" v-if="canRenote && $store.state.seperateRenoteQuote"
class="eddddedb _button" class="eddddedb _button"
v-tooltip.noDelay.bottom="i18n.ts.quote"
@click="quote()" @click="quote()"
> >
<i class="ph-quotes-bold ph-lg"></i> <i class="ph-quotes-bold ph-lg"></i>
@ -14,6 +15,7 @@ import type { Note } from 'misskey-js/built/entities';
import { pleaseLogin } from '@/scripts/please-login'; import { pleaseLogin } from '@/scripts/please-login';
import * as os from '@/os'; import * as os from '@/os';
import { $i } from '@/account'; import { $i } from '@/account';
import { i18n } from '@/i18n';
const props = defineProps<{ const props = defineProps<{
note: Note; note: Note;

1
packages/client/src/components/MkRenoteButton.vue
View File

@ -3,6 +3,7 @@
v-if="canRenote" v-if="canRenote"
ref="buttonRef" ref="buttonRef"
class="eddddedb _button canRenote" class="eddddedb _button canRenote"
v-tooltip.noDelay.bottom="i18n.ts.renote"
@click="renote(false, $event)" @click="renote(false, $event)"
> >
<i class="ph-repeat-bold ph-lg"></i> <i class="ph-repeat-bold ph-lg"></i>

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

@ -1,5 +1,5 @@
<template> <template>
<button class="skdfgljsdkf _button" @click="star($event)"> <button class="skdfgljsdkf _button" v-tooltip.noDelay.bottom="text" @click="star($event)">
<i class="ph-star-bold ph-lg"></i> <i class="ph-star-bold ph-lg"></i>
</button> </button>
</template> </template>
@ -10,6 +10,8 @@ import Ripple from '@/components/MkRipple.vue';
import { pleaseLogin } from '@/scripts/please-login'; import { pleaseLogin } from '@/scripts/please-login';
import * as os from '@/os'; import * as os from '@/os';
const text = 'Like';
const props = defineProps<{ const props = defineProps<{
note: Note; note: Note;
}>(); }>();