Commit 9058e125 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'pedroms-change-copy-to-clipboard-icon' into 'master'

Change copy to clipboard icon

See merge request gitlab-org/gitlab!23983
parents 143aa282 e27e1cea
......@@ -121,7 +121,7 @@ export default {
:title="title"
>
<slot>
<icon name="duplicate" />
<icon name="copy-to-clipboard" />
</slot>
</gl-button>
</template>
......@@ -53,7 +53,7 @@ module ButtonHelper
}
content_tag :button, button_attributes do
concat(sprite_icon('duplicate')) unless hide_button_icon
concat(sprite_icon('copy-to-clipboard')) unless hide_button_icon
concat(button_text)
end
end
......
......@@ -27,7 +27,7 @@
.card-header
.float-right
%button.js-clipboard-trigger.btn.btn-sm{ title: t('sherlock.copy_to_clipboard'), type: :button }
= sprite_icon('duplicate')
= sprite_icon('copy-to-clipboard')
%pre.hidden
= @query.formatted_query
%strong
......@@ -42,7 +42,7 @@
.card-header
.float-right
%button.js-clipboard-trigger.btn.btn-sm{ title: t('sherlock.copy_to_clipboard'), type: :button }
= sprite_icon('duplicate')
= sprite_icon('copy-to-clipboard')
%pre.hidden
= @query.explain
%strong
......
---
title: Change vague copy to clipboard icon to a clearer icon.
merge_request: 23983
author:
type: changed
......@@ -173,7 +173,7 @@ describe ButtonHelper do
expect(element.attr('data-clipboard-text')).to eq(nil)
expect(element.inner_text).to eq("")
expect(element.to_html).to include sprite_icon('duplicate')
expect(element.to_html).to include sprite_icon('copy-to-clipboard')
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment