From ba82d913b1ddb2c35769a73082a7bc36757c9928 Mon Sep 17 00:00:00 2001
From: Hagen Schink <h.schink@finn.de>
Date: Wed, 21 May 2014 11:04:43 +0200
Subject: [PATCH] Replace close icon by icon font equivalent

---
 .../reporting_engine/reporting.css.erb         | 18 +++++++++---------
 lib/widget/filters/remove_button.rb            |  3 +--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/assets/stylesheets/reporting_engine/reporting.css.erb b/lib/assets/stylesheets/reporting_engine/reporting.css.erb
index 32bd132b2e..da17efe45c 100644
--- a/lib/assets/stylesheets/reporting_engine/reporting.css.erb
+++ b/lib/assets/stylesheets/reporting_engine/reporting.css.erb
@@ -180,23 +180,23 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   margin-right: -2px;
 }
 
-.filter_rem {
-  color: transparent;
+.filter_rem { }
+
+.icon-reporting-filter-rem {
+  background: #E6E6E6;
   overflow: hidden;
   cursor: pointer;
-  background: no-repeat center center transparent;
   height: 18px;
   width: 18px;
-  border-style: none;
   display: block;
   margin: 0 0 0 2px;
 }
 
-.icon-filter-rem {
-  background-image: url(<%= asset_path 'reporting_engine/close.gif' %>);
-  position: relative;
-  float: right;
-  padding: 0px;
+.icon-reporting-filter-rem:before {
+  padding: inherit;
+  font-size: 12px;
+  vertical-align: text-top;
+  margin-left: 3px;
 }
 
 /***** icons *****/
diff --git a/lib/widget/filters/remove_button.rb b/lib/widget/filters/remove_button.rb
index eb3bb24082..20c5f5672d 100644
--- a/lib/widget/filters/remove_button.rb
+++ b/lib/widget/filters/remove_button.rb
@@ -25,8 +25,7 @@ class Widget::Filters::RemoveButton < Widget::Filters::Base
     write(content_tag(:td, :width => "25px") do
       hidden_field = tag :input, :id => "rm_#{filter_class.underscore_name}",
         :name => "fields[]", :type => "hidden", :value => ""
-      button = tag :input, :type => "button", :value => "",
-        :class => "icon filter_rem icon-filter-rem", :title => l(:description_remove_filter)
+      button = icon_wrapper('icon icon-close icon-reporting-filter-rem filter_rem', l(:description_remove_filter))
       content_tag(:div, hidden_field + button, :id => "rm_box_#{filter_class.underscore_name}", :class => "remove-box")
     end)
   end