From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 29 Oct 2016 08:22:37 +0000 (+0000)
Subject: Use regular icon-* class.
X-Git-Tag: 3.4.0~627
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=604ce984ebd2ee8f54d5a6904ead846241f73eb0;p=redmine.git

Use regular icon-* class.

git-svn-id: http://svn.redmine.org/redmine/trunk@15928 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/helpers/my_helper.rb b/app/helpers/my_helper.rb
index c7cf53499..23e738977 100644
--- a/app/helpers/my_helper.rb
+++ b/app/helpers/my_helper.rb
@@ -27,7 +27,7 @@ module MyHelper
         content = render_block_content(block, user)
         if content.present?
           if options[:edit]
-            close = link_to("", {:action => "remove_block", :block => block}, :method => 'post', :class => "close-icon")
+            close = link_to(l(:button_delete), {:action => "remove_block", :block => block}, :method => 'post', :class => "icon-only icon-close")
             content = close + content_tag('div', content, :class => 'handle')
           end
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 6ec614edf..d5554ff3c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1077,25 +1077,12 @@ div.wiki img {vertical-align:middle; max-width:100%;}
   color:#505050;
   line-height:1.5em;
 }
-.mypage-box .close-icon {
+.mypage-box .icon-close {
   float:right;
-  z-index:500;
 }
 
 .handle {cursor: move;}
 
-a.close-icon {
-  display:block;
-  margin-top:3px;
-  overflow:hidden;
-  width:12px;
-  height:12px;
-  background-repeat: no-repeat;
-  cursor:pointer;
-  background-image:url('../images/close.png');
-}
-a.close-icon:hover {background-image:url('../images/close_hl.png');}
-
 /***** Gantt chart *****/
 .gantt_hdr {
   position:absolute;
@@ -1224,6 +1211,8 @@ a.close-icon:hover {background-image:url('../images/close_hl.png');}
 .icon-not-ok { background-image: url(../images/false.png); }
 .icon-link-break { background-image: url(../images/link_break.png); }
 .icon-list { background-image: url(../images/text_list_bullets.png); }
+.icon-close { background-image: url(../images/close.png); }
+.icon-close:hover { background-image: url(../images/close_hl.png); }
 
 .icon-file { background-image: url(../images/files/default.png); }
 .icon-file.text-plain { background-image: url(../images/files/text.png); }