Skip to content

Commit

Permalink
fix: overlapping text on small screens
Browse files Browse the repository at this point in the history
Signed-off-by: greta <[email protected]>
  • Loading branch information
GretaD committed Aug 28, 2024
1 parent f66b05a commit c76ca3a
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/components/EnvelopeSkeleton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ export default {
flex: 0 0 auto;
justify-content: center;
align-self: start;
margin-top: -4px;
margin-top: 0;
}
}
Expand Down
23 changes: 22 additions & 1 deletion src/components/Message.vue
Original file line number Diff line number Diff line change
Expand Up @@ -170,12 +170,16 @@ export default {
.reply-buttons {
margin: 0 10px 0 50px;
display: flex;
flex-wrap: wrap;
gap: 5px;
justify-content: space-between;
align-items: center;
&__suggested {
display: flex;
justify-content: flex-start;
display: flex;
flex-wrap: wrap;
gap: 5px;
&__button {
margin-right: 5px;
border-radius: 12px;
Expand All @@ -189,4 +193,21 @@ export default {
margin-left: auto;
}
}
@media screen and (max-width: 600px) {
.reply-buttons {
display: flex;
flex-wrap: wrap;
gap: 5px;
&__suggested {
display: flex;
flex-wrap: wrap;
gap: 5px;
}
&__notsuggested {
margin-left: 0;
}
}
}
</style>
20 changes: 17 additions & 3 deletions src/components/ThreadEnvelope.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
{{ isEncrypted ? t('mail', 'Encrypted message') : envelope.previewText }}
</span>
</div>
<div class="tagline">
<div v-for="tag in tags"

Check failure on line 68 in src/components/ThreadEnvelope.vue

View workflow job for this annotation

GitHub Actions / NPM lint

Expected indentation of 6 tabs but found 5 tabs
:key="tag.id"

Check failure on line 69 in src/components/ThreadEnvelope.vue

View workflow job for this annotation

GitHub Actions / NPM lint

Expected indentation of 7 tabs but found 6 tabs
class="tag-group">

Check failure on line 70 in src/components/ThreadEnvelope.vue

View workflow job for this annotation

GitHub Actions / NPM lint

Expected indentation of 7 tabs but found 6 tabs
Expand All @@ -74,6 +75,7 @@
{{ translateTagDisplayName(tag) }}

Check failure on line 75 in src/components/ThreadEnvelope.vue

View workflow job for this annotation

GitHub Actions / NPM lint

Expected indentation of 8 tabs but found 7 tabs
</span>

Check failure on line 76 in src/components/ThreadEnvelope.vue

View workflow job for this annotation

GitHub Actions / NPM lint

Expected indentation of 7 tabs but found 6 tabs
</div>

Check failure on line 77 in src/components/ThreadEnvelope.vue

View workflow job for this annotation

GitHub Actions / NPM lint

Expected indentation of 6 tabs but found 5 tabs
</div>
</div>
<div class="envelope__header__left__unsubscribe">
<NcButton v-if="message && message.dkimValid && (message.unsubscribeUrl || message.unsubscribeMailto)"
Expand Down Expand Up @@ -887,9 +889,10 @@ export default {
<style lang="scss" scoped>
.sender {
margin-left: 8px;
&__email{
color: var(--color-text-maxcontrast);
text-overflow: ellipsis;
overflow: hidden;
}
&__external{
Expand Down Expand Up @@ -1038,8 +1041,6 @@ export default {
color: var(--color-text-maxcontrast);
}
&__left__sender-subject-tags {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
width: 100%;
}
Expand Down Expand Up @@ -1088,13 +1089,19 @@ export default {
left: 0;
opacity: 15%;
}
.tagline {
display: flex;
text-overflow: ellipsis;
overflow: hidden;
}
.tag-group {
display: inline-block;
border: 1px solid transparent;
border-radius: var(--border-radius-pill);
position: relative;
margin: 0 1px;
overflow: hidden;
text-overflow: ellipsis;
left: 4px;
}
.smime-text {
Expand All @@ -1106,4 +1113,11 @@ export default {
display: inline;
align-items: center;
}
@media only screen and (max-width: 400px) {
.sender {
text-overflow: ellipsis;
overflow: hidden;
width: 180px;
}
}
</style>

0 comments on commit c76ca3a

Please sign in to comment.