Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 16:37:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix "Collapse the TO" (#1199)

Browse source
This commit is contained in:
RainLoop Team 2017-06-02 21:32:24 +03:00
parent f61a4cc483
commit 673ada299a
2 changed files with 24 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

29
dev/Styles/MessageView.less
View file

@ -165,25 +165,12 @@ html.rl-no-preview-pane {
vertical-align: middle; vertical-align: middle;
} }
.senderParent {
margin: 7px 0;
&.-top {
margin-top: 0;
}
&.-middle {
margin-top: -5px;
margin-bottom: -5px;
}
&.-bottom {
margin-bottom: 0;
}
}
.messageButtons { .messageButtons {
margin-top: 5px; margin-top: 5px;
} }
.informationShort { .informationShort {
margin: 4px 0;
margin-left: 5px; margin-left: 5px;
margin-right: 50px; margin-right: 50px;
@ -191,18 +178,20 @@ html.rl-no-preview-pane {
.g-ui-link; .g-ui-link;
} }
&.-bottom {
margin-right: 5px;
max-height: 100px;
overflow-y: auto;
}
html.rl-mobile &{ html.rl-mobile &{
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
} }
} }
.informationShortWrp {
max-height: 100px;
overflow-y: auto;
min-height: 30px;
margin-top: 4px;
}
.informationFull { .informationFull {
margin-top: 10px; margin-top: 10px;
border: 1px solid #ddd; border: 1px solid #ddd;

37
rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html
View file

@ -238,38 +238,31 @@
<div> <div>
<img class="fromPic" data-bind="visible: viewUserPicVisible, attr: {'src': viewUserPic() }"> <img class="fromPic" data-bind="visible: viewUserPicVisible, attr: {'src': viewUserPic() }">
<div style="overflow: hidden;"> <div style="overflow: hidden;">
<div class="senderParent -top"> <div class="informationShort" data-bind="event: { 'dblclick': toggleFullScreen }">
<div class="informationShort -top" data-bind="event: { 'dblclick': toggleFullScreen }"> <span>
<span> <span class="from" data-bind="html: viewFromShort, title: viewFrom"></span>
<span class="from" data-bind="html: viewFromShort, title: viewFrom"></span> <span data-bind="visible: viewFromDkimVisibility">
<span data-bind="visible: viewFromDkimVisibility"> &nbsp;
&nbsp; <i data-bind="css: viewFromDkimStatusIconClass, title: viewFromDkimStatusTitle" />
<i data-bind="css: viewFromDkimStatusIconClass, title: viewFromDkimStatusTitle" />
</span>
</span> </span>
<span data-bind="visible: 0 < viewTimeStamp()"> </span>
(<span class="date" data-moment-format="FULL" data-bind="moment: viewTimeStamp"></span>) <span data-bind="visible: 0 < viewTimeStamp()">
</span> (<span class="date" data-moment-format="FULL" data-bind="moment: viewTimeStamp"></span>)
</div> </span>
<div class="clearfix"></div>
</div> </div>
<div class="senderParent" data-bind="visible: viewTo, css: {'-middle': viewCc(), '-bottom': !viewCc()}"> <div class="informationShortWrp">
<div class="informationShort" data-bind="event: { 'dblclick': toggleFullScreen }, css: {'-middle': viewCc(), '-bottom': !viewCc()}"> <div class="informationShort" data-bind="visible: viewTo, event: { 'dblclick': toggleFullScreen }">
<span> <span>
<span class="i18n uiLabel labelTo" data-i18n="MESSAGE/LABEL_TO" <span class="i18n uiLabel labelTo" data-i18n="MESSAGE/LABEL_TO"
></span>:&nbsp;<span class="to" data-bind="text: viewTo"></span> ></span>:&nbsp;<span class="to" data-bind="text: viewTo"></span>
</span> </span>
</div> </div>
<div class="clearfix"></div> <div class="informationShort" data-bind="visible: viewCc, event: { 'dblclick': toggleFullScreen }">
</div>
<div class="senderParent -bottom" data-bind="visible: viewCc">
<div class="informationShort -bottom" data-bind="event: { 'dblclick': toggleFullScreen }">
<span> <span>
<span class="i18n uiLabel labelTo" data-i18n="MESSAGE/LABEL_CC" <span class="i18n uiLabel labelTo" data-i18n="MESSAGE/LABEL_CC"
></span>:&nbsp;<span class="to" data-bind="text: viewCc"></span> ></span>:&nbsp;<span class="to" data-bind="text: viewCc"></span>
</span> </span>
</div> </div>
<div class="clearfix"></div>
</div> </div>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>