Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e27e1cea
Commit
e27e1cea
authored
Feb 03, 2020
by
Pedro Moreira da Silva
Committed by
Phil Hughes
Feb 03, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change copy to clipboard icon
parent
c9097f27
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
5 deletions
+10
-5
app/assets/javascripts/vue_shared/components/modal_copy_button.vue
...s/javascripts/vue_shared/components/modal_copy_button.vue
+1
-1
app/helpers/button_helper.rb
app/helpers/button_helper.rb
+1
-1
app/views/sherlock/queries/_general.html.haml
app/views/sherlock/queries/_general.html.haml
+2
-2
changelogs/unreleased/pedroms-change-copy-to-clipboard-icon.yml
...logs/unreleased/pedroms-change-copy-to-clipboard-icon.yml
+5
-0
spec/helpers/button_helper_spec.rb
spec/helpers/button_helper_spec.rb
+1
-1
No files found.
app/assets/javascripts/vue_shared/components/modal_copy_button.vue
View file @
e27e1cea
...
...
@@ -121,7 +121,7 @@ export default {
:title="title"
>
<slot>
<icon
name=
"
duplicate
"
/>
<icon
name=
"
copy-to-clipboard
"
/>
</slot>
</gl-button>
</
template
>
app/helpers/button_helper.rb
View file @
e27e1cea
...
...
@@ -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
...
...
app/views/sherlock/queries/_general.html.haml
View file @
e27e1cea
...
...
@@ -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
...
...
changelogs/unreleased/pedroms-change-copy-to-clipboard-icon.yml
0 → 100644
View file @
e27e1cea
---
title
:
Change vague copy to clipboard icon to a clearer icon.
merge_request
:
23983
author
:
type
:
changed
spec/helpers/button_helper_spec.rb
View file @
e27e1cea
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment