From dce0bb0ef806d88a855c362f359b7b1a350deff2 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 26 Feb 2015 16:41:38 -0800
Subject: finish converting "delete" to trash icons for consistency. The 'x'
 was left in a couple of places like the group list widget and saved search
 term widget and ignoring friend suggestions where it was more appropriate to
 leave it.

---
 view/tpl/mail_list.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/mail_list.tpl')

diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index 6b06f6127..8643f27b9 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-remove 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}}" ><i class="icon-trash mail-icons drop-icons"></i></a></span>
 	<div class="clear">&nbsp;</div>
 </div>
-- 
cgit v1.2.3


From ddaf5c067dcee0b8712e62bd710927d63fdf4d46 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 4 Mar 2015 14:00:36 -0800
Subject: cleanup mail buttons

---
 view/tpl/mail_list.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/mail_list.tpl')

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>
-- 
cgit v1.2.3