Merge pull request 'fix font size + remove unecessary class' (#10058) from Freeplay/calckey:note-fixes into develop

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10058
This commit is contained in:
Kainoa Kanter 2023-05-07 22:31:39 +00:00
commit f079bc9dc2
2 changed files with 16 additions and 16 deletions

View File

@ -12,7 +12,7 @@
<MkNoteSub
v-for="note in conversation"
:key="note.id"
class="reply-to-more"
class="reply-to"
:note="note"
/>
<MkNoteSub
@ -414,15 +414,7 @@ onUnmounted(() => {
}
> .reply-to {
margin-bottom: -16px;
}
> .reply-to-more {
// opacity: 0.7;
cursor: pointer;
@media (pointer: coarse) {
cursor: default;
}
padding-bottom: 16px;
}
> .renote {
@ -478,10 +470,11 @@ onUnmounted(() => {
> .article {
padding-block: 28px 6px;
padding-top: 12px;
&:last-child {
padding-bottom: 24px;
}
font-size: 1.1em;
font-size: 1.1rem;
overflow: clip;
outline: none;
scroll-margin-top: calc(var(--stickyTop) + 20vh);
@ -503,7 +496,6 @@ onUnmounted(() => {
// Hover
.reply :deep(.main),
.reply-to,
.reply-to-more,
:deep(.more) {
position: relative;
&::before {
@ -517,14 +509,19 @@ onUnmounted(() => {
transition: opacity 0.2s;
z-index: -1;
}
&.reply-to,
&.reply-to-more {
&.reply-to {
&::before {
inset: 0px 8px;
}
&:not(.max-width_450px)::before {
bottom: 12px;
}
&:first-of-type::before {
top: 12px;
}
&.reply.max-width_500px:first-of-type::before {
top: 4px;
}
}
// &::after {
// content: "";
@ -557,8 +554,11 @@ onUnmounted(() => {
// }
}
&.max-width_500px {
font-size: 0.9em;
}
&.max-width_450px {
> .reply-to-more:first-child {
> .reply-to:first-child {
padding-top: 14px;
}
> .renote {

View File

@ -361,6 +361,7 @@ function noteClick(e) {
> .main {
display: flex;
cursor: pointer;
> .avatar-container {
margin-right: 8px;
@ -376,7 +377,6 @@ function noteClick(e) {
> .body {
flex: 1;
min-width: 0;
cursor: pointer;
margin: 0 -200px;
padding: 0 200px;
overflow: clip;