Skip to content

Commit

Permalink
remove margin from MkNoteSimple root
Browse files Browse the repository at this point in the history
  • Loading branch information
saschanaz committed Dec 30, 2023
1 parent 7384216 commit 12b82ac
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
6 changes: 5 additions & 1 deletion packages/frontend/src/components/MkNote.vue
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
<MkPoll v-if="appearNote.poll" :note="appearNote" :class="$style.poll"/>
<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" :class="$style.urlPreview"/>
<MkNoteSimple v-if="appearNote.renote" :note="appearNote.renote" :quoted="true"/>
<MkNoteSimple v-if="appearNote.renote" :class="$style.quote" :note="appearNote.renote" :quoted="true"/>
<button v-if="isLong && collapsed" :class="$style.collapsed" class="_button" @click="collapsed = false">
<span :class="$style.collapsedLabel">{{ i18n.ts.showMore }}</span>
</button>
Expand Down Expand Up @@ -800,6 +800,10 @@ function emitUpdReaction(emoji: string, delta: number) {
font-size: 80%;
}

.quote {
margin: 8px 0;
}

.channel {
opacity: 0.7;
font-size: 80%;
Expand Down
1 change: 0 additions & 1 deletion packages/frontend/src/components/MkNoteSimple.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ const showContent = ref(false);
}

.quoted {
margin: 8px 0;
padding: 16px;
border: dashed 1px var(--renote);
border-radius: 8px;
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/src/components/MkUrlPreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkButton>
</div>
</template>
<template v-else-if="postExpanded">
<div v-else-if="postExpanded">
<div v-if="tweetId" ref="twitter">
<iframe
ref="tweet"
Expand All @@ -43,7 +43,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<i v-if="tweetId" class="ti ti-x"></i> {{ i18n.ts.close }}
</MkButton>
</div>
</template>
</div>
<div v-else>
<component :is="self ? 'MkA' : 'a'" :class="[$style.link, { [$style.compact]: compact }]" :[attr]="self ? url.substring(local.length) : url" rel="nofollow noopener" :target="target" :title="url">
<div v-if="thumbnail && !sensitive" :class="$style.thumbnail" :style="defaultStore.state.dataSaver.urlPreview ? '' : `background-image: url('${thumbnail}')`">
Expand Down

0 comments on commit 12b82ac

Please sign in to comment.