From 2910dd416473c199cb79e8e3c4921548f6eb9eea Mon Sep 17 00:00:00 2001
From: Marius BALTEANU <marius.balteanu@zitec.com>
Date: Sun, 19 May 2019 14:21:59 +0000
Subject: [PATCH 1/2] Use the regular "icon icon-*" classes for sort-handler

---
 app/helpers/application_helper.rb                  | 2 +-
 app/helpers/my_helper.rb                           | 4 ++--
 app/views/custom_field_enumerations/index.html.erb | 2 +-
 public/stylesheets/application.css                 | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 09df265..e9c99c4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -570,7 +570,7 @@ module ApplicationHelper
       :reorder_param => options[:param] || object.class.name.underscore
     }
     content_tag('span', '',
-      :class => "sort-handle",
+      :class => "icon-only icon-sort-handle sort-handle",
       :data => data,
       :title => l(:button_sort))
   end
diff --git a/app/helpers/my_helper.rb b/app/helpers/my_helper.rb
index ca96dd7..72e1607 100644
--- a/app/helpers/my_helper.rb
+++ b/app/helpers/my_helper.rb
@@ -34,10 +34,10 @@ module MyHelper
   def render_block(block, user)
     content = render_block_content(block, user)
     if content.present?
-      handle = content_tag('span', '', :class => 'sort-handle', :title => l(:button_move))
+      handle = content_tag('span', '', :class => 'icon-only icon-sort-handle sort-handle', :title => l(:button_move))
       close = link_to(l(:button_delete),
                       {:action => "remove_block", :block => block},
-                      :remote => true, :method => 'post', 
+                      :remote => true, :method => 'post',
                       :class => "icon-only icon-close", :title => l(:button_delete))
       content = content_tag('div', handle + close, :class => 'contextual') + content
 
diff --git a/app/views/custom_field_enumerations/index.html.erb b/app/views/custom_field_enumerations/index.html.erb
index 915cba2..66a0977 100644
--- a/app/views/custom_field_enumerations/index.html.erb
+++ b/app/views/custom_field_enumerations/index.html.erb
@@ -6,7 +6,7 @@
   <ul id="custom_field_enumerations" class="flat">
   <% @custom_field.enumerations.each_with_index do |value, position| %>
     <li>
-      <span class="sort-handle"></span>
+      <span class="icon-only icon-sort-handle sort-handle"></span>
       <%= hidden_field_tag "custom_field_enumerations[#{value.id}][position]", position, :class => 'position' %>
       <%= text_field_tag "custom_field_enumerations[#{value.id}][name]", value.name, :size => 40 %>
       <%= hidden_field_tag "custom_field_enumerations[#{value.id}][active]", 0 %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index e9be4cc..faa3887 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1497,6 +1497,7 @@ td.gantt_selected_column .gantt_hdr,.gantt_selected_column_container {
 .icon-add-bullet { background-image: url(../images/bullet_add.png); }
 .icon-shared { background-image: url(../images/link.png); }
 .icon-actions { background-image: url(../images/3_bullets.png); }
+.icon-sort-handle { background-image: url(../images/reorder.png); }
 
 .icon-file { background-image: url(../images/files/default.png); }
 .icon-file.text-plain { background-image: url(../images/files/text.png); }
@@ -1517,7 +1518,7 @@ td.gantt_selected_column .gantt_hdr,.gantt_selected_column_container {
 .icon-file.application-zip { background-image: url(../images/files/zip.png); }
 .icon-file.application-x-gzip { background-image: url(../images/files/zip.png); }
 
-.sort-handle { width:16px; height:16px; background:url(../images/reorder.png) no-repeat 0 50%; cursor:move; }
+.sort-handle { cursor:move; }
 .sort-handle.ajax-loading { background-image: url(../images/loading.gif); }
 tr.ui-sortable-helper { border:1px solid #e4e4e4; }
 
-- 
2.1.4