Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/MailboxThread.vue
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
</div>
</template>

<Thread v-if="showThread" @delete="deleteMessage" />
<Thread v-if="showThread" :current-account-email="account.emailAddress" @delete="deleteMessage" />
<NoMessageSelected v-else-if="hasEnvelopes" />
</AppContent>
</template>
Expand Down
3 changes: 1 addition & 2 deletions src/components/Message.vue
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ export default {
}

.reply-buttons {
margin: 26px 30px 0 50px;
margin: 0 calc(var(--default-grid-baseline) * 4) calc(var(--default-grid-baseline) * 2) calc(var(--default-grid-baseline) * 14);
display: flex;
flex-wrap: wrap;
gap: 5px;
Expand All @@ -205,7 +205,6 @@ export default {

&__notsuggested {
margin-inline-start: auto;
margin-inline-end: -12px;
}
}
@media screen and (max-width: 600px) {
Expand Down
3 changes: 1 addition & 2 deletions src/components/MessageHTMLBody.vue
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,7 @@ export default {
<style lang="scss" scoped>
// account for 8px margin on iframe body
.html-message-body {
margin-inline-start: 50px;
margin-top: 2px;
margin : 2px calc(var(--default-grid-baseline) * 2) 0 calc(var(--default-grid-baseline) * 14);
background-color: #FFFFFF;
}

Expand Down
15 changes: 11 additions & 4 deletions src/components/Thread.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ export default {
ThreadEnvelope,
Popover,
},
props: {
currentAccountEmail: {
type: String,
required: true,
},
},

data() {
return {
Expand Down Expand Up @@ -165,7 +171,7 @@ export default {
threadParticipants() {
const recipients = this.thread.flatMap(envelope => {
return envelope.from.concat(envelope.to).concat(envelope.cc)
})
}).filter(participant => participant.email !== this.currentAccountEmail)
return uniqBy(prop('email'), recipients)
},
threadSubject() {
Expand Down Expand Up @@ -558,7 +564,7 @@ export default {

.mail-message-body {
flex: 1;
margin-bottom: calc(var(--default-grid-baseline) * 7);
margin-bottom: calc(var(--default-grid-baseline) * 2);
position: relative;
}

Expand Down Expand Up @@ -599,7 +605,8 @@ export default {
// initial width
width: 0;
// while scrolling, the back button overlaps with subject on small screen
padding-inline-start: calc(var(--border-radius-container-large) + var(--header-height));
// 66px to allign with the sender Envelope -> 8px margin + 2px border+ avatar -> 40px width + envelope__header -> 8px padding + sender-> margin 8px
padding-inline-start: 66px;
// grow and try to fill 100%
flex: 1 1 auto;
h2,
Expand Down Expand Up @@ -639,7 +646,7 @@ export default {
}

#mail-content {
margin: calc(var(--default-grid-baseline) * 2) calc(var(--default-grid-baseline) * 10) 0 calc(var(--default-grid-baseline) * 15);
margin: calc(var(--default-grid-baseline) * 2) calc(var(--default-grid-baseline) * 10) 0 calc(var(--default-grid-baseline) * 14);
}

#mail-content iframe {
Expand Down
Loading