diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-02-22 20:37:34 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-02-22 20:37:34 +0300 |
| commit | 81e5c9c28966d2a7662bd60b9f1ea68f4aadb936 (patch) | |
| tree | c76b4f754041ca33b6258ee3c042e5e6db6ad0cd | |
| parent | b31c68aa2afbbcdb5459f156472fa44261de0a9c (diff) | |
| parent | aa1ac6368eefd906bd1f379cf22a3feb662639ef (diff) | |
Merge branch 'fix-moving-revert-button' into 'master'
Fixed revert button tooltip placement causing movement
Before:
After:
See merge request !2910
| -rw-r--r-- | app/helpers/commits_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |