diff --git a/app/helpers/additionals_clipboardjs_helper.rb b/app/helpers/additionals_clipboardjs_helper.rb index 66a7e7bf..f217ca29 100644 --- a/app/helpers/additionals_clipboardjs_helper.rb +++ b/app/helpers/additionals_clipboardjs_helper.rb @@ -12,9 +12,10 @@ module AdditionalsClipboardjsHelper data['clipboard-text'] = clipboard_text_from_button if clipboard_text_from_button.present? - content_tag(:span, image_tag('paste.png', plugin: 'additionals'), + content_tag(:button, nil, id: "zc_#{target}", - class: 'clipboard_button', + class: 'clipboard_button far fa-copy', + type: 'button', title: l(:label_copy_to_clipboard), data: data) end diff --git a/assets/images/paste.png b/assets/images/paste.png deleted file mode 100644 index c0490eb7..00000000 Binary files a/assets/images/paste.png and /dev/null differ diff --git a/assets/stylesheets/additionals.css b/assets/stylesheets/additionals.css index 000be9fb..5cfda26c 100644 --- a/assets/stylesheets/additionals.css +++ b/assets/stylesheets/additionals.css @@ -171,6 +171,12 @@ div.clear-both { clear: both; } text-align: left; } +.clipboard_button { + padding: 0 2px 0 0; + text-align: center; + float: left; +} + /* TAGs */ ul.tags { diff --git a/assets/stylesheets/clipboard.css b/assets/stylesheets/clipboard.css deleted file mode 100644 index b4bc67a8..00000000 --- a/assets/stylesheets/clipboard.css +++ /dev/null @@ -1,22 +0,0 @@ -/* -ClipboardJS -*/ - -.clipboard_button { - display: block; - float: left; - position: relative; - padding: 0; - text-align: center; - border-color: #bbb; - border-style: solid; - border-width: 1px; - width: 24px; - height: 23px; -} - -.clipboard_button img { - padding-top: 4px; - padding-left: 5px; - display: block; -} diff --git a/lib/additionals/helpers.rb b/lib/additionals/helpers.rb index 56a8dd9e..d0ded27d 100644 --- a/lib/additionals/helpers.rb +++ b/lib/additionals/helpers.rb @@ -246,8 +246,7 @@ module Additionals end def additionals_load_clipboardjs - additionals_include_css('clipboard') + - additionals_include_js('clipboard.min') + additionals_include_js('clipboard.min') end def additionals_load_observe_field