Skip to content

Commit 7330563

Browse files
committed
fix(lint): fix all lint errors introduced by recipient display changes
- Fix import order in ThreadEnvelope.vue (alphabetical: ConfirmationModal, Error, EventModal, RecipientBubble) - Fix MessageLoadingSkeleton indentation (1 tab → 2 tabs) - Remove extra blank lines in ThreadEnvelope.vue and Thread.vue CSS - Fix SCSS unmatched brace in Thread.vue (leftover from avatar-header removal) - Remove unused currentAccountEmail prop from Thread.vue and its corresponding binding in MailboxThread.vue All 220 unit tests pass; webpack builds cleanly.
1 parent ed6fa4a commit 7330563

File tree

3 files changed

+28
-66
lines changed

3 files changed

+28
-66
lines changed

src/components/MailboxThread.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
</div>
191191
</template>
192192

193-
<Thread v-if="showThread" :current-account-email="account.emailAddress" @delete="deleteMessage" />
193+
<Thread v-if="showThread" @delete="deleteMessage" />
194194
<NoMessageSelected v-else-if="hasEnvelopes" />
195195
</AppContent>
196196
</template>

src/components/Thread.vue

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<h2 dir="auto" :title="threadSubject">
1717
{{ threadSubject }}
1818
</h2>
19-
2019
</div>
2120
</div>
2221
<ThreadSummary v-if="showSummaryBox" :loading="summaryLoading" :summary="summaryText" />
@@ -63,13 +62,6 @@ export default {
6362
ThreadEnvelope,
6463
},
6564
66-
props: {
67-
currentAccountEmail: {
68-
type: String,
69-
required: true,
70-
},
71-
},
72-
7365
data() {
7466
return {
7567
summaryLoading: false,
@@ -644,35 +636,6 @@ export default {
644636
}
645637
}
646638
647-
.avatar-header {
648-
height: var(--default-clickable-area);
649-
overflow: hidden;
650-
display: flex;
651-
align-items: stretch;
652-
653-
:deep(.v-popper--theme-dropdown.v-popper__popper .v-popper__inner) {
654-
height: 300px;
655-
width: 250px;
656-
overflow: auto;
657-
}
658-
}
659-
660-
.avatar-more {
661-
display: flex;
662-
background-color: var(--color-background-dark);
663-
border-radius: var(--border-radius-large);
664-
align-items: center;
665-
cursor: pointer;
666-
}
667-
668-
.v-popper.avatar-more {
669-
padding: calc(var(--default-grid-baseline) * 2);
670-
}
671-
672-
.avatar-hidden {
673-
visibility: hidden;
674-
}
675-
676639
.app-content-list-item-star.icon-starred {
677640
display: none;
678641
}

src/components/ThreadEnvelope.vue

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
{{ envelope.from && envelope.from[0] ? envelope.from[0].email : '' }}
6969
</p>
7070
</div>
71-
<div v-if="hasChangedSubject" class="subline">
71+
<div v-if="hasChangedSubject" class="subline">
7272
{{ cleanSubject }}
7373
</div>
7474
<div v-if="showSubline" class="subline">
@@ -272,32 +272,32 @@
272272
</div>
273273
</div>
274274
<div v-if="expanded" class="envelope__recipients">
275-
<div v-if="envelope.to && envelope.to.length" class="recipients">
276-
<span class="recipients__label">{{ t('mail', 'To:') }}</span>
277-
<RecipientBubble
278-
v-for="recipient in envelope.to"
279-
:key="recipient.email"
280-
:email="recipient.email"
281-
:label="recipient.label" />
282-
</div>
283-
<div v-if="envelope.cc && envelope.cc.length" class="recipients">
284-
<span class="recipients__label">{{ t('mail', 'Cc:') }}</span>
285-
<RecipientBubble
286-
v-for="recipient in envelope.cc"
287-
:key="recipient.email"
288-
:email="recipient.email"
289-
:label="recipient.label" />
290-
</div>
291-
<div v-if="envelope.bcc && envelope.bcc.length" class="recipients">
292-
<span class="recipients__label">{{ t('mail', 'Bcc:') }}</span>
293-
<RecipientBubble
294-
v-for="recipient in envelope.bcc"
295-
:key="recipient.email"
296-
:email="recipient.email"
297-
:label="recipient.label" />
275+
<div v-if="envelope.to && envelope.to.length" class="recipients">
276+
<span class="recipients__label">{{ t('mail', 'To:') }}</span>
277+
<RecipientBubble
278+
v-for="recipient in envelope.to"
279+
:key="recipient.email"
280+
:email="recipient.email"
281+
:label="recipient.label" />
282+
</div>
283+
<div v-if="envelope.cc && envelope.cc.length" class="recipients">
284+
<span class="recipients__label">{{ t('mail', 'Cc:') }}</span>
285+
<RecipientBubble
286+
v-for="recipient in envelope.cc"
287+
:key="recipient.email"
288+
:email="recipient.email"
289+
:label="recipient.label" />
290+
</div>
291+
<div v-if="envelope.bcc && envelope.bcc.length" class="recipients">
292+
<span class="recipients__label">{{ t('mail', 'Bcc:') }}</span>
293+
<RecipientBubble
294+
v-for="recipient in envelope.bcc"
295+
:key="recipient.email"
296+
:email="recipient.email"
297+
:label="recipient.label" />
298+
</div>
298299
</div>
299-
</div>
300-
<MessageLoadingSkeleton v-if="loading === Loading.Skeleton" />
300+
<MessageLoadingSkeleton v-if="loading === Loading.Skeleton" />
301301
<Message
302302
v-if="message"
303303
v-show="loading === Loading.Done"
@@ -367,7 +367,6 @@ import IconFavorite from 'vue-material-design-icons/Star.vue'
367367
import StarOutline from 'vue-material-design-icons/StarOutline.vue'
368368
import DeleteIcon from 'vue-material-design-icons/TrashCanOutline.vue'
369369
import Avatar from './Avatar.vue'
370-
import RecipientBubble from './RecipientBubble.vue'
371370
import ConfirmModal from './ConfirmationModal.vue'
372371
import Error from './Error.vue'
373372
import EventModal from './EventModal.vue'
@@ -378,6 +377,7 @@ import Message from './Message.vue'
378377
import MessageLoadingSkeleton from './MessageLoadingSkeleton.vue'
379378
import Moment from './Moment.vue'
380379
import MoveModal from './MoveModal.vue'
380+
import RecipientBubble from './RecipientBubble.vue'
381381
import SourceModal from './SourceModal.vue'
382382
import TagModal from './TagModal.vue'
383383
import TaskModal from './TaskModal.vue'
@@ -1346,7 +1346,6 @@ export default {
13461346
white-space: nowrap;
13471347
}
13481348
1349-
13501349
&--expanded {
13511350
min-height: 350px;
13521351
}

0 commit comments

Comments
 (0)