limepotato/jormungandr-bite
1
0
Fork 0
mirror of https://iceshrimp.dev/limepotato/jormungandr-bite.git synced 2024-11-29 05:17:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply suggestions

Browse source
This commit is contained in:
Jeder 2023-07-27 12:57:10 +02:00 committed by aprilthepink
parent 07587bbce5
commit 66a0f59b6a
4 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
locales/en-US.yml
View file

@ -63,9 +63,9 @@ loadMore: "Load more"
showMore: "Show more" showMore: "Show more"
newer: "newer" newer: "newer"
older: "older" older: "older"
showLess: "Close"
expandAllCws: "Show content for all replies" expandAllCws: "Show content for all replies"
collapseAllCws: "Hide content for all replies" collapseAllCws: "Hide content for all replies"
showLess: "Show less"
youGotNewFollower: "followed you" youGotNewFollower: "followed you"
receiveFollowRequest: "Follow request received" receiveFollowRequest: "Follow request received"
followRequestAccepted: "Follow request accepted" followRequestAccepted: "Follow request accepted"
@ -1127,6 +1127,7 @@ removeQuote: "Remove quote"
removeRecipient: "Remove recipient" removeRecipient: "Remove recipient"
removeMember: "Remove member" removeMember: "Remove member"
verifiedLink: "Verified link" verifiedLink: "Verified link"
noteHidden: "This note is hidden"
_sensitiveMediaDetection: _sensitiveMediaDetection:
description: "Reduces the effort of server moderation through automatically recognizing description: "Reduces the effort of server moderation through automatically recognizing
@ -1623,7 +1624,7 @@ _widgets:
meiliIndexCount: "Indexed posts" meiliIndexCount: "Indexed posts"
_cw: _cw:
hide: "Hide" hide: "Hide content"
show: "Show content" show: "Show content"
chars: "{count} characters" chars: "{count} characters"
files: "{count} file(s)" files: "{count} file(s)"

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

@ -114,7 +114,7 @@ defineExpose({
padding: 0.4em 3em; padding: 0.4em 3em;
font-size: 0.8em; font-size: 0.8em;
border-radius: 999px; border-radius: 999px;
box-shadow: 0 0 7px 7px var(--bg); box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
} }
} }
} }

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

@ -71,7 +71,7 @@ defineExpose({
padding: 0.4em 3em; padding: 0.4em 3em;
font-size: 0.8em; font-size: 0.8em;
border-radius: 999px; border-radius: 999px;
box-shadow: 0 0 7px 7px var(--bg); box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
} }
} }
</style> </style>

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

@ -59,6 +59,7 @@
v-model="collapsed" v-model="collapsed"
v-on:keydown="focusFooter" v-on:keydown="focusFooter"
></XShowMoreButton> ></XShowMoreButton>
<span v-if="note.cw && !showContent" class="hiddenNote">{{ i18n.ts.noteHidden }}</span>
<XCwButton <XCwButton
ref="cwButton" ref="cwButton"
v-if="note.cw && !showContent" v-if="note.cw && !showContent"
@ -314,6 +315,13 @@ function focusFooter(ev) {
.wrmlmaau { .wrmlmaau {
.content { .content {
overflow-wrap: break-word; overflow-wrap: break-word;
> .hiddenNote {
display: block;
padding: 0.5em 0 0.5em;
font-weight: 700;
font-size: 1.1em;
text-align: center;
}
> .body { > .body {
transition: filter 0.1s; transition: filter 0.1s;
> .rp { > .rp {
@ -363,6 +371,7 @@ function focusFooter(ev) {
&.collapsed, &.collapsed,
&.showContent { &.showContent {
position: relative; position: relative;
min-height: calc(1em + 100px);
max-height: calc(15em + 100px); max-height: calc(15em + 100px);
> .body { > .body {
max-height: inherit; max-height: inherit;
@ -397,7 +406,7 @@ function focusFooter(ev) {
} }
:deep(.fade) { :deep(.fade) {
inset: 0; inset: 0;
top: 90px; top: 0;
} }
} }