diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-02-22 17:37:34 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-24 12:50:13 +0100 |
| commit | 069fec4f43630010f61a87c052795b5bcdaae349 (patch) | |
| tree | 6abb26a5053ce00d3756acff2df8fa124c4b847f | |
| parent | c89ee575bd239e272cf4df604d4548d865d3f501 (diff) | |
| download | gitlab-ce-069fec4f43630010f61a87c052795b5bcdaae349.tar.gz | |
Merge branch 'fix-moving-revert-button' into 'master'
Fixed revert button tooltip placement causing movement
Before:
After:
See merge request !2910
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/helpers/commits_helper.rb | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 63968027956..dd977712eaa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ v 8.5.1 - Fix a set of small UI glitches in project, profile, and wiki pages - Restrict permissions on public/uploads - Fix the merge request side-by-side view after loading diff results + - Fix the look of tooltip for the "Revert" button - Add when the Builds & Runners API changes got introduced - Fix error 500 on some merged merge requests - Fix an issue causing the content of the issuable sidebar to disappear diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index 7ff539118d3..a09e91578b6 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -130,7 +130,7 @@ module CommitsHelper if can_collaborate_with_project? content_tag :span, 'data-toggle' => 'modal', 'data-target' => '#modal-revert-commit' do - link_to 'Revert', '#modal-revert-commit', 'data-toggle' => 'tooltip', title: tooltip, class: "btn btn-default btn-grouped btn-#{btn_class}" + link_to 'Revert', '#modal-revert-commit', 'data-toggle' => 'tooltip', 'data-container' => 'body', title: tooltip, class: "btn btn-default btn-grouped btn-#{btn_class}" end elsif can?(current_user, :fork_project, @project) continue_params = { @@ -142,7 +142,7 @@ module CommitsHelper namespace_key: current_user.namespace.id, continue: continue_params) - link_to 'Revert', fork_path, class: 'btn btn-grouped btn-close', method: :post, 'data-toggle' => 'tooltip', title: tooltip + link_to 'Revert', fork_path, class: 'btn btn-grouped btn-close', method: :post, 'data-toggle' => 'tooltip', 'data-container' => 'body', title: tooltip end end |