diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-10-13 12:56:38 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-13 12:56:38 +0300 |
commit | a053430e94e21bbf81524304f9b52a106f654b54 (patch) | |
tree | 54561082a92bb3c8c354bab2f39db4242d40bae8 | |
parent | 9d44ef2b3c3781044f7663623a5233a1ebc0dc0e (diff) | |
parent | b0646c4f23aff0343c2fd455c7dc5de52ca6a362 (diff) |
Merge branch '22635-clipboard-icon' into 'master'
Fix "Copy to clipboard" action button has a mismatching white background.
## What does this MR do?
Adds a class to all the clipboard icons which removes the extra padding.
It also fixes some odd overlay when over the clipboard icon in commits list.
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
To fix the extra padding and background color that was visible when it should not be
## Screenshots (if relevant)
![commits_list](/uploads/f988e2e2e2aea41fe3f7fe41c8a857ef/commits_list.png)
![file](/uploads/ce97909fc4e602af47fea46b8fffb7ad/file.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #22635
See merge request !6785
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/helpers/button_helper.rb | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index adada3b0d02..5e026b4ec94 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -102,6 +102,7 @@ v 8.13.0 (unreleased) - Allow empty merge requests !6384 (Artem Sidorenko) - Grouped pipeline dropdown is a scrollable container - Cleanup Ci::ApplicationController. !6757 (Takuya Noguchi) + - Fixes padding in all clipboard icons that have .btn class - Fix a typo in doc/api/labels.md - API: all unknown routing will be handled with 404 Not Found - Make guests unable to view MRs on private projects diff --git a/app/helpers/button_helper.rb b/app/helpers/button_helper.rb index a695aceea76..85e1dc33ee8 100644 --- a/app/helpers/button_helper.rb +++ b/app/helpers/button_helper.rb @@ -15,14 +15,14 @@ module ButtonHelper # # See http://clipboardjs.com/#usage def clipboard_button(data = {}) - css_class = data[:class] || 'btn-clipboard' + css_class = data[:class] || 'btn-clipboard btn-transparent' data = { toggle: 'tooltip', placement: 'bottom', container: 'body' }.merge(data) content_tag :button, icon('clipboard'), class: "btn #{css_class}", data: data, type: :button, - title: "Copy to Clipboard" + title: 'Copy to Clipboard' end def http_clone_button(project, placement = 'right', append_link: true) |