]> source.dussan.org Git - redmine.git/commitdiff
Use regular icon-* class.
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Sat, 29 Oct 2016 08:22:37 +0000 (08:22 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Sat, 29 Oct 2016 08:22:37 +0000 (08:22 +0000)
git-svn-id: http://svn.redmine.org/redmine/trunk@15928 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/helpers/my_helper.rb
public/stylesheets/application.css

index c7cf534996370f76dfd63179f7d70837ffc7f0d0..23e738977c1b7147b06fedf14ee53de712b8db97 100644 (file)
@@ -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
 
index 6ec614edf9f3a8cb9b43016426ef97d7a3a038d2..d5554ff3c94d1a5bf7a11d9dd985b2dc05af4a55 100644 (file)
@@ -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); }