diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-05-17 15:14:15 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-17 15:14:15 +0100 |
| commit | 92857b0dd68bf41eea1536f327d1e3a83e629611 (patch) | |
| tree | f63f37e73829f0d3ffd13fe6bbb7f68914aded32 | |
| parent | f1818e578259e28b44a575ca0d6297d67e53777e (diff) | |
| download | gitlab-ce-92857b0dd68bf41eea1536f327d1e3a83e629611.tar.gz | |
Revert "Merge branch '46303_copy_button_fix_embedded_snippets' into 'master'"
This reverts commit f1818e578259e28b44a575ca0d6297d67e53777e.
| -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, 2 insertions, 8 deletions
diff --git a/app/assets/stylesheets/framework/snippets.scss b/app/assets/stylesheets/framework/snippets.scss index 430633bb01b..606d4675f19 100644 --- a/app/assets/stylesheets/framework/snippets.scss +++ b/app/assets/stylesheets/framework/snippets.scss @@ -67,8 +67,7 @@ padding: 8px 40px; } - .embed-toggle, - .snippet-clipboard-btn { + .embed-toggle { height: 35px; } } diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml index 9f55c10d19b..836230ae8ee 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.snippet-clipboard-btn.btn.btn-default.has-tooltip{ title: "Copy to clipboard", 'data-clipboard-target': '.js-snippet-url-area' } + %button.js-clipboard-btn.btn.btn-default.has-tooltip{ title: "Copy to clipboard", 'data-clipboard-target': '#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 deleted file mode 100644 index c8cdf3672b3..00000000000 --- a/changelogs/unreleased/46303_copy_button_fix_embedded_snippets.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: fixed copy to blipboard button in embed bar of snippets -merge_request: 18923 -author: haseebeqx -type: fixed |