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

Merge branch 'develop' of codeberg.org:calckey/calckey into develop

Browse source
This commit is contained in:
ThatOneCalculator 2023-02-06 20:04:07 -08:00
parent d4c7db67ce f7c4d1a4b4
commit fdbbd6652a
No known key found for this signature in database
GPG key ID: 8703CACD01000000
5 changed files with 7 additions and 7 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",
"version": "13.1.2",
"version": "13.1.3-beta",
"codename": "aqua",
"repository": {
"type": "git",

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

@ -1,5 +1,5 @@
<template>
<button class="nrvgflfu _button" @click="toggle">
<button class="nrvgflfu _button" @click.stop.prevent="toggle">
<b>{{ modelValue ? i18n.ts._cw.hide : i18n.ts._cw.show }}</b>
<span v-if="!modelValue">{{ label }}</span>
</button>

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

@ -2,7 +2,7 @@
<div class="hoawjimk">
<XBanner v-for="media in mediaList.filter(media => !previewable(media))" :key="media.id" :media="media"/>
<div v-if="mediaList.filter(media => previewable(media)).length > 0" class="gird-container" :class="{ dmWidth: inDm }">
<div ref="gallery" :data-count="mediaList.filter(media => previewable(media)).length">
<div ref="gallery" :data-count="mediaList.filter(media => previewable(media)).length" @click.stop.prevent>
<template v-for="media in mediaList.filter(media => previewable(media))">
<XVideo v-if="media.type.startsWith('video')" :key="media.id" :video="media"/>
<XImage v-else-if="media.type.startsWith('image')" :key="media.id" class="image" :data-id="media.id" :image="media" :raw="raw"/>

4
packages/client/src/components/MkNote.vue
View file

@ -62,10 +62,10 @@
<XPoll v-if="appearNote.poll" ref="pollViewer" :note="appearNote" class="poll"/>
<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote"/></div>
<button v-if="isLong && collapsed" class="fade _button" @click="collapsed = false">
<button v-if="isLong && collapsed" class="fade _button" @click.stop.prevent="collapsed = false">
<span>{{ i18n.ts.showMore }}</span>
</button>
<button v-else-if="isLong && !collapsed" class="showLess _button" @click="collapsed = true">
<button v-else-if="isLong && !collapsed" class="showLess _button" @click.stop.prevent="collapsed = true">
<span>{{ i18n.ts.showLess }}</span>
</button>
</div>

4
packages/client/src/components/MkSubNoteContent.vue
View file

@ -14,10 +14,10 @@
<summary>{{ i18n.ts.poll }}</summary>
<XPoll :note="note"/>
</div>
<button v-if="isLong && collapsed" class="fade _button" @click="collapsed = false">
<button v-if="isLong && collapsed" class="fade _button" @click.stop.prevent="collapsed = false">
<span>{{ i18n.ts.showMore }}</span>
</button>
<button v-if="isLong && !collapsed" class="showLess _button" @click="collapsed = true">
<button v-if="isLong && !collapsed" class="showLess _button" @click.stop.prevent="collapsed = true">
<span>{{ i18n.ts.showLess }}</span>
</button>
</div>