From 2a6cce858cdebe34adc482563387949aa331b574 Mon Sep 17 00:00:00 2001
From: Mario Volke <info@mariovolke.com>
Date: Fri, 21 Nov 2014 11:19:57 +0100
Subject: [PATCH] remove duplicate trash icon

---
 src/img/icons/trash.svg | 18 ------------------
 src/tpl/nav.html        |  2 +-
 src/tpl/read.html       |  2 +-
 3 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 src/img/icons/trash.svg

diff --git a/src/img/icons/trash.svg b/src/img/icons/trash.svg
deleted file mode 100644
index 1d339ca..0000000
--- a/src/img/icons/trash.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="614.6 369 48.4 60" enable-background="new 614.6 369 48.4 60" xml:space="preserve">
-<path fill="#0A0A0A" d="M621.3,429c-2.6,0-4.7-2.1-4.7-4.6v-41.6c0-0.1-0.1-0.2-0.2-0.2c-0.8,0-1.7-0.6-1.7-2.3
-	c0-1.4,1.5-1.6,2.6-1.6h8.1c0.1,0,0.2-0.1,0.2-0.2v-5c0-1.2,0.5-2.4,1.4-3.2c0.9-0.9,2.1-1.3,3.4-1.3h16.9c1.3,0,2.5,0.5,3.3,1.3
-	c0.9,0.9,1.4,2,1.4,3.2v5c0,0.1,0.1,0.2,0.2,0.2h8.2c1.2,0,2.6,0.4,2.6,1.6c0,1.1-0.6,2.1-1.7,2.1c-0.1,0-0.2,0.1-0.2,0.2v41.7
-	c0,2.5-2.1,4.6-4.8,4.6L621.3,429L621.3,429z M620.8,381.4c-0.8,0-1.5,0.7-1.5,1.5v41.8c0,0.5,0.8,1.6,1.4,1.6l36.5,0.3
-	c0.5,0,1.3-0.9,1.3-1.4l-0.2-42.1c0-0.8-0.7-1.5-1.5-1.5L620.8,381.4z M629.4,371.5c-0.5,0-0.9,0.3-0.9,0.8v6.2
-	c0,0.1,0.1,0.2,0.2,0.2h20.2c0.1,0,0.2-0.1,0.2-0.2v-6.2c0-0.5-0.4-0.8-0.9-0.8H629.4z M649.1,418.7c-0.3,0-0.5-0.1-0.7-0.3
-	c-0.7-0.7-0.6-2.3-0.6-2.3v-25.1c0,0,0,0,0,0c0,0-0.1-1.5,0.5-2.1c0.2-0.2,0.4-0.3,0.7-0.3c0.3,0,0.5,0.1,0.7,0.3
-	c0.6,0.7,0.6,2.1,0.6,2.1V416v0c0,0,0.1,1.6-0.6,2.3C649.6,418.6,649.4,418.7,649.1,418.7z M639,418.7c-0.3,0-0.5-0.1-0.7-0.3
-	c-0.7-0.7-0.6-2.3-0.6-2.3v-25.1c0,0,0,0,0,0c0,0-0.1-1.5,0.5-2.1c0.2-0.2,0.4-0.3,0.7-0.3c0.3,0,0.5,0.1,0.7,0.3
-	c0.6,0.7,0.6,2.1,0.6,2.1V416v0c0,0,0.1,1.6-0.6,2.3C639.5,418.6,639.3,418.7,639,418.7z M629,418.7c-0.3,0-0.5-0.1-0.7-0.3
-	c-0.7-0.7-0.6-2.3-0.6-2.3v-25.1c0,0,0,0,0,0c0,0-0.1-1.5,0.5-2.1c0.2-0.2,0.4-0.3,0.7-0.3c0.3,0,0.5,0.1,0.7,0.3
-	c0.6,0.7,0.6,2.1,0.6,2.1V416v0c0,0,0.1,1.6-0.6,2.3C629.5,418.6,629.2,418.7,629,418.7z"/>
-</svg>
diff --git a/src/tpl/nav.html b/src/tpl/nav.html
index f7d3c2a..f6d720a 100644
--- a/src/tpl/nav.html
+++ b/src/tpl/nav.html
@@ -13,7 +13,7 @@
           <use ng-if="folder.type === 'Sent'" xlink:href="#icon-sent" />
           <use ng-if="folder.type === 'Outbox'" xlink:href="#icon-outbox" />
           <use ng-if="folder.type === 'Drafts'" xlink:href="#icon-draft" />
-          <use ng-if="folder.type === 'Trash'" xlink:href="#icon-trash" />
+          <use ng-if="folder.type === 'Trash'" xlink:href="#icon-delete" />
           <use ng-if="folder.type === 'Flagged'" xlink:href="#icon-star" />
         </svg>
         {{folder.type}}
diff --git a/src/tpl/read.html b/src/tpl/read.html
index f96549a..9dee4e2 100644
--- a/src/tpl/read.html
+++ b/src/tpl/read.html
@@ -26,7 +26,7 @@
           <svg><use xlink:href="#icon-folder" /><title>Move mail</title></svg>
         </button>
         <button wo-touch="deleteMessage(state.mailList.selected)" class="btn-icon-light" title="Delete mail">
-          <svg><use xlink:href="#icon-trash" /><title>Delete mail</title></svg>
+          <svg><use xlink:href="#icon-delete" /><title>Delete mail</title></svg>
         </button>
         <button class="btn-icon-light" title="Reply to" wo-dropdown="#read-reply-selection" wo-dropdown-position="center">
           <svg><use xlink:href="#icon-reply_light" /><title>Reply to</title></svg>