From 820935be3f9055a46cf32db06934c365f0d327e8 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 23 Jul 2014 23:32:39 +0200 Subject: [PATCH] table: add gray channel icon --- app/assets/images/sprite.svg | 17 ++++++++++------ .../app/views/generic/table.jst.eco | 4 ++++ app/assets/stylesheets/zzz.css.erb | 20 +++++++++++++++++++ 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg index bc11d7f99..b7472ce19 100644 --- a/app/assets/images/sprite.svg +++ b/app/assets/images/sprite.svg @@ -17,12 +17,17 @@ - - - - - - + + + + + + + + + + + diff --git a/app/assets/javascripts/app/views/generic/table.jst.eco b/app/assets/javascripts/app/views/generic/table.jst.eco index dbbb1007b..9bcc29852 100644 --- a/app/assets/javascripts/app/views/generic/table.jst.eco +++ b/app/assets/javascripts/app/views/generic/table.jst.eco @@ -16,6 +16,7 @@ <% for item in @header: %> style="<%= item.style %>"<% end %>><%- @T( item.display ) %> <% end %> + <% if @destroy: %> <%- @T('Delete') %> <% end %> @@ -103,6 +104,9 @@ <% if item_clone.link: %><% end %> <% end %> + + + <% if @destroy: %> <% end %> diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 4bcbee888..6c9c6604d 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -972,6 +972,26 @@ ol.tabs li { background-position: -68px -141px; } + .gray.email.channel.icon { + background-position: -85px -141px; + } + + .gray.received-calls.channel.icon { + background-position: -102px -141px; + } + + .gray.outbound-calls.channel.icon { + background-position: -119px -141px; + } + + .gray.facebook.channel.icon { + background-position: -136px -141px; + } + + .gray.twitter.channel.icon { + background-position: -153px -141px; + } + .mood.icon { width: 60px; height: 59px;