diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-11-01 18:21:46 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-01 18:21:46 +0000 |
commit | 7ac414693b7bcedad23a7c45738da44f1fe7675e (patch) | |
tree | 47d86a97feda38b69ae3dab319d42126f6261226 | |
parent | 83180841f7d7cd9c65d11c7b3a7aea83f9e3824a (diff) | |
parent | 3497d4da3ec130dc974929269526b904843de11f (diff) | |
download | gitlab-ce-7ac414693b7bcedad23a7c45738da44f1fe7675e.tar.gz |
Merge branch '23641-remove-header-tooltips' into 'master'
Remove tooltips from project header
Closes #23641
See merge request !7211
-rw-r--r-- | app/assets/javascripts/star.js | 2 | ||||
-rw-r--r-- | app/views/projects/buttons/_fork.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/buttons/_star.html.haml | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/javascripts/star.js b/app/assets/javascripts/star.js index a18d16ea46c..cfd1e2204d5 100644 --- a/app/assets/javascripts/star.js +++ b/app/assets/javascripts/star.js @@ -11,11 +11,9 @@ $this.parent().find('.star-count').text(data.star_count); if (isStarred) { $starSpan.removeClass('starred').text('Star'); - gl.utils.updateTooltipTitle($this, 'Star project'); $starIcon.removeClass('fa-star').addClass('fa-star-o'); } else { $starSpan.addClass('starred').text('Unstar'); - gl.utils.updateTooltipTitle($this, 'Unstar project'); $starIcon.removeClass('fa-star-o').addClass('fa-star'); } }; diff --git a/app/views/projects/buttons/_fork.html.haml b/app/views/projects/buttons/_fork.html.haml index 29d549a60f5..27da86b9efe 100644 --- a/app/views/projects/buttons/_fork.html.haml +++ b/app/views/projects/buttons/_fork.html.haml @@ -5,10 +5,10 @@ = custom_icon('icon_fork') %span Fork - else - = link_to new_namespace_project_fork_path(@project.namespace, @project), title: 'Fork project', class: 'btn has-tooltip' do + = link_to new_namespace_project_fork_path(@project.namespace, @project), title: 'Fork project', class: 'btn' do = custom_icon('icon_fork') %span Fork %div.count-with-arrow %span.arrow - = link_to namespace_project_forks_path(@project.namespace, @project), title: 'Forks', class: 'count has-tooltip' do + = link_to namespace_project_forks_path(@project.namespace, @project), title: 'Forks', class: 'count' do = @project.forks_count diff --git a/app/views/projects/buttons/_star.html.haml b/app/views/projects/buttons/_star.html.haml index 311583037e5..12d35101770 100644 --- a/app/views/projects/buttons/_star.html.haml +++ b/app/views/projects/buttons/_star.html.haml @@ -1,5 +1,5 @@ - if current_user - = link_to toggle_star_namespace_project_path(@project.namespace, @project), { class: 'btn star-btn toggle-star has-tooltip', method: :post, remote: true, title: current_user.starred?(@project) ? 'Unstar project' : 'Star project' } do + = link_to toggle_star_namespace_project_path(@project.namespace, @project), { class: 'btn star-btn toggle-star', method: :post, remote: true } do - if current_user.starred?(@project) = icon('star') %span.starred Unstar |