From 99d6ab383fd6ce95008d38edfe26f880eb78225e Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 26 May 2015 20:03:52 +0200 Subject: [PATCH] fix trash icon --- .../javascripts/app/views/generic/table.jst.eco | 2 +- app/assets/stylesheets/svg-dimensions.css | 1 + app/assets/stylesheets/zammad.css.scss | 5 +++++ public/assets/images/icons.svg | 2 +- public/assets/images/icons/trash.svg | 12 ++++++++++++ 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 public/assets/images/icons/trash.svg diff --git a/app/assets/javascripts/app/views/generic/table.jst.eco b/app/assets/javascripts/app/views/generic/table.jst.eco index bccd925a7..ed6d1a6f9 100644 --- a/app/assets/javascripts/app/views/generic/table.jst.eco +++ b/app/assets/javascripts/app/views/generic/table.jst.eco @@ -80,7 +80,7 @@ <% end %> <% if @destroy: %> - + <% end %> <% end %> diff --git a/app/assets/stylesheets/svg-dimensions.css b/app/assets/stylesheets/svg-dimensions.css index b0e66af82..911973215 100644 --- a/app/assets/stylesheets/svg-dimensions.css +++ b/app/assets/stylesheets/svg-dimensions.css @@ -60,5 +60,6 @@ .icon-templates { width: 24px; height: 24px; } .icon-tools { width: 24px; height: 24px; } .icon-total-tickets { width: 48px; height: 83px; } +.icon-trash { width: 16px; height: 16px; } .icon-twitter { width: 17px; height: 17px; } .icon-user { width: 16px; height: 16px; } \ No newline at end of file diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index dca515e01..1ac0a3232 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -503,6 +503,11 @@ table { padding: 0; } +.table .icon-trash { + vertical-align: middle; + fill: hsl(240,1%,77%); +} + .input-replacement { padding: 0; margin: 0; diff --git a/public/assets/images/icons.svg b/public/assets/images/icons.svg index 0a2387f8e..46e308cea 100644 --- a/public/assets/images/icons.svg +++ b/public/assets/images/icons.svg @@ -1 +1 @@ -arrow-downarrow-leftarrow-rightarrow-upcheckbox-checkedcheckboxcheckmarkclockclosecloudcogdashboarddiagonal-crossdownloademailfacebookgrouphelpimportantin-processlistloadinglock-openlocklong-arrow-rightmagnifiermarkermessagemood-badmood-goodmood-okmood-super-badmood-supergoodnoteone-ticketorganizationoutbound-callsoverviewspackagepaperclippenpersonphonepluspriority-modified-inner-circlepriority-modified-outer-circlepriorityradio-checkedradioreceived-callsreopeningreply-allreplysignoutsplitstopwatchswitchViewteamtemplatestoolstotal-ticketstwitteruser \ No newline at end of file +arrow-downarrow-leftarrow-rightarrow-upcheckbox-checkedcheckboxcheckmarkclockclosecloudcogdashboarddiagonal-crossdownloademailfacebookgrouphelpimportantin-processlistloadinglock-openlocklong-arrow-rightmagnifiermarkermessagemood-badmood-goodmood-okmood-super-badmood-supergoodnoteone-ticketorganizationoutbound-callsoverviewspackagepaperclippenpersonphonepluspriority-modified-inner-circlepriority-modified-outer-circlepriorityradio-checkedradioreceived-callsreopeningreply-allreplysignoutsplitstopwatchswitchViewteamtemplatestoolstotal-ticketstrashtwitteruser \ No newline at end of file diff --git a/public/assets/images/icons/trash.svg b/public/assets/images/icons/trash.svg new file mode 100644 index 000000000..d1e6463eb --- /dev/null +++ b/public/assets/images/icons/trash.svg @@ -0,0 +1,12 @@ + + + + trash + Created with Sketch. + + + + + + + \ No newline at end of file