mirror of
https://iceshrimp.dev/limepotato/jormungandr-bite.git
synced 2024-11-26 11:57:34 -07:00
note-improvements (#9768)
Fixes #9745, quote icon, note spacing adjustments, border radius's in noGap Co-authored-by: Freeplay <Freeplay@duck.com> Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9768 Co-authored-by: Free <freeplay@duck.com> Co-committed-by: Free <freeplay@duck.com>
This commit is contained in:
parent
23da34f495
commit
89d59b5ea0
8 changed files with 19 additions and 17 deletions
|
@ -178,6 +178,13 @@ export default defineComponent({
|
|||
border-radius: 0;
|
||||
box-shadow: none;
|
||||
|
||||
&:first-child {
|
||||
border-radius: var(--radius) var(--radius) 0 0;
|
||||
}
|
||||
&:last-child {
|
||||
border-radius: 0 0 var(--radius) var(--radius);
|
||||
}
|
||||
|
||||
&:not(:last-child) {
|
||||
border-bottom: solid 0.5px var(--divider);
|
||||
}
|
||||
|
|
|
@ -47,7 +47,6 @@ const bgCss = bg.toRgbString();
|
|||
border-radius: 999px;
|
||||
max-width: 100%;
|
||||
white-space: nowrap;
|
||||
overflow: clip;
|
||||
text-overflow: ellipsis;
|
||||
color: var(--mention);
|
||||
|
||||
|
|
|
@ -382,7 +382,6 @@ function readPromo() {
|
|||
width: 0;
|
||||
flex-grow: 1;
|
||||
position: relative;
|
||||
margin-bottom: -10px;
|
||||
line-height: 28px;
|
||||
}
|
||||
> .line {
|
||||
|
@ -452,17 +451,13 @@ function readPromo() {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
& + .article {
|
||||
padding-top: 10px !important;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
> .article {
|
||||
padding: 28px 32px 16px;
|
||||
padding: 4px 32px 10px;
|
||||
cursor: pointer;
|
||||
|
||||
|
||||
@media (pointer: coarse) {
|
||||
cursor: default;
|
||||
}
|
||||
|
@ -662,17 +657,16 @@ function readPromo() {
|
|||
padding-top: 6px;
|
||||
> .note-context {
|
||||
padding-inline: 16px;
|
||||
margin-top: 0;
|
||||
margin-top: 8px;
|
||||
> :not(.line) {
|
||||
margin-top: 5px;
|
||||
margin-top: 0px;
|
||||
}
|
||||
> .line {
|
||||
margin-right: 10px;
|
||||
}
|
||||
}
|
||||
> .article {
|
||||
padding: 16px 16px 9px;
|
||||
|
||||
padding: 4px 16px 8px;
|
||||
> .main > .header-container > .avatar {
|
||||
margin-right: 10px;
|
||||
// top: calc(14px + var(--stickyTop, 0px));
|
||||
|
|
|
@ -56,7 +56,6 @@ const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultS
|
|||
border-radius: 100px;
|
||||
font-size: .8em;
|
||||
text-shadow: 0 2px 2px var(--shadow);
|
||||
|
||||
> .avatar {
|
||||
width: 3.7em;
|
||||
height: 3.7em;
|
||||
|
@ -74,10 +73,11 @@ const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultS
|
|||
width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
gap: .1em 0;
|
||||
}
|
||||
&:last-child {
|
||||
max-width: 50%;
|
||||
gap: .2em .5em;
|
||||
gap: .3em .5em;
|
||||
}
|
||||
.article > .main & {
|
||||
display: flex;
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
<MkA v-if="note.replyId" :to="`/notes/${note.replyId}`" class="reply-icon" @click.stop>
|
||||
<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
|
||||
</MkA>
|
||||
<MkA v-if="conversation && note.renoteId && note.renoteId != parentId" :to="`/notes/${note.renoteId}`" class="reply-icon" @click.stop>
|
||||
<MkA v-if="conversation && note.renoteId && note.renoteId != parentId && !note.replyId" :to="`/notes/${note.renoteId}`" class="reply-icon" @click.stop>
|
||||
<i class="ph-quotes ph-bold ph-lg"></i>
|
||||
</MkA>
|
||||
<Mfm v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
|
||||
|
@ -373,7 +373,7 @@ function noteClick(e) {
|
|||
&.reply-to, &.reply-to-more {
|
||||
padding-bottom: 0;
|
||||
&:first-child {
|
||||
padding-top: 30px;
|
||||
padding-top: 24px;
|
||||
}
|
||||
.line::before {
|
||||
margin-bottom: -16px;
|
||||
|
|
|
@ -42,6 +42,7 @@ defineExpose({
|
|||
&.noGap {
|
||||
> .notes {
|
||||
background: var(--panel);
|
||||
border-radius: var(--radius);
|
||||
}
|
||||
}
|
||||
&:not(.noGap) {
|
||||
|
|
|
@ -100,5 +100,6 @@ onUnmounted(() => {
|
|||
<style lang="scss" scoped>
|
||||
.elsfgstc {
|
||||
background: var(--panel);
|
||||
border-radius: var(--radius);
|
||||
}
|
||||
</style>
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<MkA v-if="note.replyId" :to="`/notes/${note.replyId}`" class="reply-icon" @click.stop>
|
||||
<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
|
||||
</MkA>
|
||||
<MkA v-if="conversation && note.renoteId && note.renoteId != parentId" :to="`/notes/${note.renoteId}`" class="reply-icon" @click.stop>
|
||||
<MkA v-if="conversation && note.renoteId && note.renoteId != parentId && !note.replyId" :to="`/notes/${note.renoteId}`" class="reply-icon" @click.stop>
|
||||
<i class="ph-quotes ph-bold ph-lg"></i>
|
||||
</MkA>
|
||||
</template>
|
||||
|
|
Loading…
Reference in a new issue