Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Quote): restrict overflow content for quotes / replies #11937

Merged
merged 1 commit into from
Mar 26, 2024
Merged

fix(Quote): restrict overflow content for quotes / replies #11937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/components/NewMessage/NewMessage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,6 +1066,7 @@ export default {
&__input {
flex-grow: 1;
position: relative;
min-width: 0;
}

// Override NcRichContenteditable styles
Expand Down
32 changes: 16 additions & 16 deletions src/components/Quote.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,16 @@ components.
<p dir="auto">{{ shortenedQuoteMessage }}</p>
</blockquote>
</div>
<div v-if="canCancel" class="quote__main__right">
<NcButton type="tertiary"
:aria-label="cancelQuoteLabel"
@click="handleAbort">
<template #icon>
<Close :size="20" />
</template>
</NcButton>
</div>

<NcButton v-if="canCancel"
class="quote__close"
type="tertiary"
:aria-label="cancelQuoteLabel"
@click="handleAbort">
<template #icon>
<Close :size="20" />
</template>
</NcButton>
</a>
</template>

Expand Down Expand Up @@ -297,6 +298,7 @@ export default {
border-radius: var(--border-radius-large);
border: 2px solid var(--color-border);
background-color: var(--color-main-background);
overflow: hidden;

&::before {
content: ' ';
Expand Down Expand Up @@ -343,13 +345,11 @@ export default {
gap: 4px;
}
}
&__right {
flex: 0 0 44px;
color: var(--color-text-maxcontrast);
font-size: 13px;
padding: 0 8px 0 8px;
position: relative;
margin: auto;

&__close {
position: absolute !important;
top: 4px;
right: 4px;
}
}

Expand Down
Loading