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

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

Browse source
This commit is contained in:
ThatOneCalculator 2023-03-25 21:19:26 -07:00
commit a4fd0e3e3b
8 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/client/src/components/MkDateSeparatedList.vue
View file

@ -178,6 +178,13 @@ export default defineComponent({
border-radius: 0; border-radius: 0;
box-shadow: none; 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) { &:not(:last-child) {
border-bottom: solid 0.5px var(--divider); border-bottom: solid 0.5px var(--divider);
} }

1
packages/client/src/components/MkMention.vue
View file

@ -47,7 +47,6 @@ const bgCss = bg.toRgbString();
border-radius: 999px; border-radius: 999px;
max-width: 100%; max-width: 100%;
white-space: nowrap; white-space: nowrap;
overflow: clip;
text-overflow: ellipsis; text-overflow: ellipsis;
color: var(--mention); color: var(--mention);

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

@ -382,7 +382,6 @@ function readPromo() {
width: 0; width: 0;
flex-grow: 1; flex-grow: 1;
position: relative; position: relative;
margin-bottom: -10px;
line-height: 28px; line-height: 28px;
} }
> .line { > .line {
@ -452,17 +451,13 @@ function readPromo() {
} }
} }
} }
& + .article {
padding-top: 10px !important;
}
} }
> .article { > .article {
padding: 28px 32px 16px; padding: 4px 32px 10px;
cursor: pointer; cursor: pointer;
@media (pointer: coarse) { @media (pointer: coarse) {
cursor: default; cursor: default;
} }
@ -662,17 +657,16 @@ function readPromo() {
padding-top: 6px; padding-top: 6px;
> .note-context { > .note-context {
padding-inline: 16px; padding-inline: 16px;
margin-top: 0; margin-top: 8px;
> :not(.line) { > :not(.line) {
margin-top: 5px; margin-top: 0px;
} }
> .line { > .line {
margin-right: 10px; margin-right: 10px;
} }
} }
> .article { > .article {
padding: 16px 16px 9px; padding: 4px 16px 8px;
> .main > .header-container > .avatar { > .main > .header-container > .avatar {
margin-right: 10px; margin-right: 10px;
// top: calc(14px + var(--stickyTop, 0px)); // top: calc(14px + var(--stickyTop, 0px));

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

@ -56,7 +56,6 @@ const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultS
border-radius: 100px; border-radius: 100px;
font-size: .8em; font-size: .8em;
text-shadow: 0 2px 2px var(--shadow); text-shadow: 0 2px 2px var(--shadow);
> .avatar { > .avatar {
width: 3.7em; width: 3.7em;
height: 3.7em; height: 3.7em;
@ -74,10 +73,11 @@ const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultS
width: 0; width: 0;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
gap: .1em 0;
} }
&:last-child { &:last-child {
max-width: 50%; max-width: 50%;
gap: .2em .5em; gap: .3em .5em;
} }
.article > .main & { .article > .main & {
display: flex; display: flex;

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

@ -17,7 +17,7 @@
<MkA v-if="note.replyId" :to="`/notes/${note.replyId}`" class="reply-icon" @click.stop> <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> <i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
</MkA> </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> <i class="ph-quotes ph-bold ph-lg"></i>
</MkA> </MkA>
<Mfm v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$i" :custom-emojis="note.emojis"/> <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 { &.reply-to, &.reply-to-more {
padding-bottom: 0; padding-bottom: 0;
&:first-child { &:first-child {
padding-top: 30px; padding-top: 24px;
} }
.line::before { .line::before {
margin-bottom: -16px; margin-bottom: -16px;

1
packages/client/src/components/MkNotes.vue
View file

@ -42,6 +42,7 @@ defineExpose({
&.noGap { &.noGap {
> .notes { > .notes {
background: var(--panel); background: var(--panel);
border-radius: var(--radius);
} }
} }
&:not(.noGap) { &:not(.noGap) {

1
packages/client/src/components/MkNotifications.vue
View file

@ -100,5 +100,6 @@ onUnmounted(() => {
<style lang="scss" scoped> <style lang="scss" scoped>
.elsfgstc { .elsfgstc {
background: var(--panel); background: var(--panel);
border-radius: var(--radius);
} }
</style> </style>

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

@ -6,7 +6,7 @@
<MkA v-if="note.replyId" :to="`/notes/${note.replyId}`" class="reply-icon" @click.stop> <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> <i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
</MkA> </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> <i class="ph-quotes ph-bold ph-lg"></i>
</MkA> </MkA>
</template> </template>