diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-05-16 20:02:20 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-17 17:23:02 +0300 |
| commit | b605916fe75650b73fa11f68c9434bb00229e88c (patch) | |
| tree | b48569df27fff5cb1a7a6ed4d870d6eb0c818346 /app | |
| parent | 6621fdf7fd4e77e539e7139cc8641501eb4ccc68 (diff) | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/snippets.scss | 3 | ||||
| -rw-r--r-- | app/views/shared/snippets/_header.html.haml | 2 |
2 files changed, 3 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 |