natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

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
parent 04f954ca78 8ab7843e44
commit f079bc9dc2
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/client/src/components/MkNoteDetailed.vue
View File

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

2
packages/client/src/components/MkNoteSub.vue
View File

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