aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-04 14:00:36 -0800
committerfriendica <info@friendica.com>2015-03-04 14:00:36 -0800
commitddaf5c067dcee0b8712e62bd710927d63fdf4d46 (patch)
tree58580c0d0d5819da08642ae07c5b678979520544 /view
parent5f0e073cfab76a78c993e1b3a32c9296338424a2 (diff)
downloadvolse-hubzilla-ddaf5c067dcee0b8712e62bd710927d63fdf4d46.tar.gz
volse-hubzilla-ddaf5c067dcee0b8712e62bd710927d63fdf4d46.tar.bz2
volse-hubzilla-ddaf5c067dcee0b8712e62bd710927d63fdf4d46.zip
cleanup mail buttons
Diffstat (limited to 'view')
-rw-r--r--view/css/mod_mail.css8
-rwxr-xr-xview/tpl/mail_conv.tpl4
-rwxr-xr-xview/tpl/mail_list.tpl2
3 files changed, 5 insertions, 9 deletions
diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css
index 011c3edd5..11affffbd 100644
--- a/view/css/mod_mail.css
+++ b/view/css/mod_mail.css
@@ -45,8 +45,6 @@ img.mail-list-sender-photo {
#prvmail-rotator-wrapper {
float: left;
margin-top: 10px;
-/* margin-right: 10px;
- width: 24px; */
cursor: pointer;
}
@@ -79,16 +77,14 @@ img.mail-list-sender-photo {
float: right;
margin-right: 30px;
margin-top: 15px;
-}
-
-.mail-conv-delete-icon {
- border: none;
+ margin-bottom: 5px;
}
.mail-conv-recall-wrapper {
float: right;
margin-right: 10px;
margin-top: 15px;
+ margin-bottom: 5px;
}
.mail-conv-outside-wrapper-end {
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index a75939617..ec8f8c1e3 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -8,9 +8,9 @@
<div class="mail-conv-date">{{$mail.date}}</div>
<div class="mail-conv-subject">{{$mail.subject}}</div>
<div class="mail-conv-body">{{$mail.body}}</div>
- <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" ><i class="icon-trash mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div>
+ <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon btn btn-default" ><i class="icon-trash mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div>
{{if $mail.can_recall}}
- <div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="mail/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div>
+ <div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="mail/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon btn btn-default" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div>
{{/if}}
<div class="mail-conv-outside-wrapper-end"></div>
</div>
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index 8643f27b9..1d499e12f 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -3,6 +3,6 @@
<span class="mail-list">{{$from_name}}</span>
<span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="mail/{{$id}}" class="mail-link">{{$subject}}</a></span>
<span class="mail-list" title="{{$date}}">{{$date}}</span>
- <span class="mail-list mail-list-remove" class="btn btn-default btn-sm"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-trash mail-icons drop-icons"></i></a></span>
+ <span class="mail-list mail-list-remove" class="btn btn-default btn-sm"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-default btn-sm" ><i class="icon-trash mail-icons drop-icons"></i></a></span>
<div class="clear">&nbsp;</div>
</div>