diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_mail.css | 5 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 9 | ||||
| -rwxr-xr-x | view/tpl/mail_conv.tpl | 39 |
3 files changed, 22 insertions, 31 deletions
diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css index 6a98267f0..e227f550d 100644 --- a/view/css/mod_mail.css +++ b/view/css/mod_mail.css @@ -32,3 +32,8 @@ .mail-conv-outside-wrapper { margin-bottom: 20px; } + +.active .conv-participants { + color: #fff; +} + diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 83e9c64cd..0e5ff2bfb 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -737,10 +737,6 @@ div.jGrowl div.jGrowl-notification { color: $font_colour; } -.active .conv-participants { - color: #fff; -} - .contactname { font-weight: bold; display: block; @@ -1097,9 +1093,10 @@ a:hover .dropdown-sub-text { } .active .wall-item-ago, -a:active .wall-item-ago, +a.active:hover .wall-item-ago, .active .dropdown-sub-text, -a:active .dropdown-sub-text { +a:active .dropdown-sub-text, +a.active:hover .dropdown-sub-text { color: #fff; } diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index ad13ba96d..dc4eaa150 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -1,47 +1,36 @@ -<div id="mail-{{$mail.id}}" class="mail-conv-outside-wrapper"> +<div id="mail-{{$mail.id}}" class="clearfix mail-conv-outside-wrapper"> <div class="mail-conv-sender" > <a href="{{$mail.from_url}}"><img class="mail-conv-sender-photo" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" /></a> </div> - <div class="mail-conv-detail"> + <div class="clearfix mail-conv-detail"> {{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}} <div class="mail-conv-sender-name"><a href="{{$mail.from_url}}">{{$mail.from_name}}</a></div> <div class="mail-conv-date autotime wall-item-ago" title="{{$mail.date}}">{{$mail.date}}</div> </div> - <div class="clear"></div> - <div class="mail-conv-content"> - <div class="mail-conv-body"> + <div class="clearfix mail-conv-content"> + <div class="clearfix mail-conv-body"> {{$mail.body}} - <div class="clear"></div> </div> {{if $mail.attachments}} - <div class="dropdown pull-left"> - <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button> - <ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$mail.attachments}}</ul> + <div class="dropdown float-left"> + <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-fw fa-paperclip"></i></button> + <div class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$mail.attachments}}</div> </div> {{/if}} - <div class="pull-right dropdown"> + <div class="float-right dropdown"> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="mail-item-menu-{{$mail.id}}"> <i class="fa fa-cog"></i> </button> - <ul class="dropdown-menu" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}"> + <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}"> {{if $mail.can_recall}} - <li> - <a href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="fa fa-undo mail-icons"></i> {{$mail.recall}}</a> - </li> + <a class="dropdown-item" href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="fa fa-fw fa-undo"></i> {{$mail.recall}}</a> {{/if}} - <li> - <a href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}"><i class="fa fa-trash-o mail-icons"></i> {{$mail.delete}}</a> - </li> + <a class="dropdown-item" href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}"><i class="fa fa-fw fa-trash-o"></i> {{$mail.delete}}</a> {{if $mail.can_recall}} - <li class="divider"></li> - <li> - <a href="dreport/mail/{{$mail.mid}}" title="{{$mail.dreport}}" id="mail-conv-dreport-icon-{{$mail.id}}">{{$mail.dreport}}</a> - </li> + <div class="dropdown-divider"></div> + <a class="dropdown-item" href="dreport/mail/{{$mail.mid}}" title="{{$mail.dreport}}" id="mail-conv-dreport-icon-{{$mail.id}}">{{$mail.dreport}}</a> {{/if}} - </ul> - + </div> </div> - <div class="clear"></div> </div> - <div class="clear"></div> </div> |