diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-05-16 17:02:20 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-05-16 17:02:20 +0000 |
| commit | 9e41ed61ea70532578416e01c228ff7a81abc192 (patch) | |
| tree | fe1b521ddc9687d6a63aa7bdefa2ca75fde2a00e | |
| parent | d98364fa33fff8b4a571563e5f17329ffdba8a17 (diff) | |
| parent | 9b4ab0af3edfaabf63277ff245f8d1c5ab358475 (diff) | |
| download | gitlab-ce-9e41ed61ea70532578416e01c228ff7a81abc192.tar.gz | |
Merge branch '46303_copy_button_fix_embedded_snippets' into 'master'
fixed copy to cliboard button in embedded snippets
Closes #46303
See merge request gitlab-org/gitlab-ce!18923
| -rw-r--r-- | app/assets/stylesheets/framework/snippets.scss | 3 | ||||
| -rw-r--r-- | app/views/shared/snippets/_header.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/46303_copy_button_fix_embedded_snippets.yml | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/snippets.scss b/app/assets/stylesheets/framework/snippets.scss index 606d4675f19..430633bb01b 100644 --- a/app/assets/stylesheets/framework/snippets.scss +++ b/app/assets/stylesheets/framework/snippets.scss @@ -67,7 +67,8 @@ padding: 8px 40px; } - .embed-toggle { + .embed-toggle, + .snippet-clipboard-btn { height: 35px; } } diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml index 836230ae8ee..9f55c10d19b 100644 --- a/app/views/shared/snippets/_header.html.haml +++ b/app/views/shared/snippets/_header.html.haml @@ -45,6 +45,6 @@ %strong.embed-toggle-list-item= _("Share") %input.js-snippet-url-area.snippet-embed-input.form-control{ type: "text", autocomplete: 'off', value: snippet_embed } .input-group-btn - %button.js-clipboard-btn.btn.btn-default.has-tooltip{ title: "Copy to clipboard", 'data-clipboard-target': '#snippet-url-area' } + %button.js-clipboard-btn.snippet-clipboard-btn.btn.btn-default.has-tooltip{ title: "Copy to clipboard", 'data-clipboard-target': '.js-snippet-url-area' } = sprite_icon('duplicate', size: 16) .clearfix diff --git a/changelogs/unreleased/46303_copy_button_fix_embedded_snippets.yml b/changelogs/unreleased/46303_copy_button_fix_embedded_snippets.yml new file mode 100644 index 00000000000..c8cdf3672b3 --- /dev/null +++ b/changelogs/unreleased/46303_copy_button_fix_embedded_snippets.yml @@ -0,0 +1,5 @@ +--- +title: fixed copy to blipboard button in embed bar of snippets +merge_request: 18923 +author: haseebeqx +type: fixed |