Skip to content
Snippets Groups Projects
Commit ed5adda5 authored by GretaD's avatar GretaD
Browse files

Fix threading design


Signed-off-by: default avatarGretaD <gretadoci@gmail.com>
parent 7ff93512
No related branches found
No related tags found
No related merge requests found
......@@ -3,8 +3,7 @@
v-tooltip.bottom="email"
:to="newMessageRoute"
exact>
{{ label }}
</router-link>
{{ label }}</router-link>
<router-link v-else :to="newMessageRoute" exact>
{{ label }}
</router-link>
......
......@@ -2,8 +2,8 @@
<span>
<template v-for="(entry, idx) in entries">
<Address :key="entry.email" :email="entry.email" :label="entry.label" /><!--
--><span v-if="idx === entries.length - 2" :key="'split' + entry.email">{{ t('mail', 'and') }}</span><!--
--><span v-else-if="idx + 1 < entries.length" :key="'split' + entry.email">, </span>
--><span v-if="idx === entries.length - 2" :key="'split' + entry.email">{{ t('mail', 'and') }}</span>
<span v-else-if="idx + 1 < entries.length" :key="'split' + entry.email">, </span>
</template>
</span>
</template>
......
......@@ -97,6 +97,7 @@ export default {
#message-container {
flex: 1;
min-height: 50vh;
}
#message-frame {
......
......@@ -21,25 +21,27 @@
<template>
<div>
<div>
<div class="envelope--header">
<Avatar v-if="envelope.from && envelope.from[0]"
:email="envelope.from[0].email"
:display-name="envelope.from[0].label"
:disable-tooltip="true"
:size="25" />
:size="40" />
<router-link
:to="route"
event=""
class="left"
@click.native.prevent="$emit('toggleExpand', $event)">
<span class="sender">{{ envelope.from[0].label }}</span>
<span class="preview">
<!-- TODO: instead of subject it should be shown the first line of the message #2666 -->
{{ envelope.subject }}
</span>
<div class="subject">
<span class="preview">
<!-- TODO: instead of subject it should be shown the first line of the message #2666 -->
{{ envelope.subject }}
</span>
</div>
</router-link>
<div class="right">
<Moment :timestamp="envelope.dateInt" />
<Moment class="timestamp" :timestamp="envelope.dateInt" />
<div
class="button"
:class="{
......@@ -293,6 +295,7 @@ export default {
<style lang="scss" scoped>
.sender {
font-weight: bold;
margin-left: 8px;
}
.right {
......@@ -307,5 +310,41 @@ export default {
.app-content-list-item-menu {
margin-left: 4px;
}
.timestamp {
margin-right: 10px;
font-size: small;
white-space: nowrap;
margin-bottom: 0;
}
}
.button {
color: var(--color-main-background);
&:not(.active):not(.primary) {
display: none;
&.primary {
background-color: var(--color-primary);
opacity: 1;
margin-bottom: 0;
}
}
}
.avatardiv {
display: inline-block;
margin-bottom: -23px;
}
.subject {
margin-left: 8px;
cursor: default;
}
.envelope--header {
display: flex;
padding-bottom: 20px
}
.left {
flex-grow: 1;
}
</style>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment