Commit 01d6f535 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'rs-has-tooltip' into 'master'

Change remaining usages of `has_toolitp` to `has-tooltip`

See merge request !301
parents 57c26736 39cbafd2
...@@ -57,7 +57,7 @@ module ButtonHelper ...@@ -57,7 +57,7 @@ module ButtonHelper
def kerberos_clone_button(project) def kerberos_clone_button(project)
klass = 'btn js-protocol-switch' klass = 'btn js-protocol-switch'
klass << ' active' if default_clone_protocol == 'kerberos' klass << ' active' if default_clone_protocol == 'kerberos'
klass << ' has_tooltip' klass << ' has-tooltip'
content_tag :button, 'KRB5', content_tag :button, 'KRB5',
class: klass, class: klass,
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
.cover-title .cover-title
%h1 %h1
= @group.name = @group.name
%span.visibility-icon.has_tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) } %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) }
= visibility_level_icon(@group.visibility_level, fw: false) = visibility_level_icon(@group.visibility_level, fw: false)
.cover-desc.username .cover-desc.username
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.cover-title.project-home-desc .cover-title.project-home-desc
%h1 %h1
= @project.name = @project.name
%span.visibility-icon.has_tooltip{data: { container: 'body' }, title: visibility_icon_description(@project)} %span.visibility-icon.has-tooltip{data: { container: 'body' }, title: visibility_icon_description(@project)}
= visibility_level_icon(@project.visibility_level, fw: false) = visibility_level_icon(@project.visibility_level, fw: false)
- if @project.description.present? - if @project.description.present?
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
protected protected
- if @project.mirror_ever_updated_successfully? && @repository.diverged_from_upstream?(branch.name) - if @project.mirror_ever_updated_successfully? && @repository.diverged_from_upstream?(branch.name)
%span.label.label-danger.has_tooltip{data: { html: "true", title: branch_diverged_tooltip_message }} %span.label.label-danger.has-tooltip{data: { html: "true", title: branch_diverged_tooltip_message }}
= icon('exclamation-triangle') = icon('exclamation-triangle')
diverged from upstream diverged from upstream
......
- if @project.mirror? && can?(current_user, :push_code, @project) - if @project.mirror? && can?(current_user, :push_code, @project)
- size = nil unless defined?(size) && size - size = nil unless defined?(size) && size
- if @project.updating_mirror? - if @project.updating_mirror?
%span.btn.disabled.update-mirror-button.has_tooltip{title: "Updating from upstream..."} %span.btn.disabled.update-mirror-button.has-tooltip{title: "Updating from upstream..."}
= icon('refresh') = icon('refresh')
- else - else
= link_to update_now_namespace_project_mirror_path(@project.namespace, @project), method: :post, class: "btn update-mirror-button has_tooltip", title: "Update from upstream" do = link_to update_now_namespace_project_mirror_path(@project.namespace, @project), method: :post, class: "btn update-mirror-button has-tooltip", title: "Update from upstream" do
= icon('refresh') = icon('refresh')
...@@ -10,6 +10,6 @@ ...@@ -10,6 +10,6 @@
= render "shared/mirror_status" = render "shared/mirror_status"
- if @ref.present? && @project.mirror_ever_updated_successfully? && @repository.diverged_from_upstream?(@ref) - if @ref.present? && @project.mirror_ever_updated_successfully? && @repository.diverged_from_upstream?(@ref)
%span.has_tooltip{data: { html: "true", title: branch_diverged_tooltip_message }} %span.has-tooltip{data: { html: "true", title: branch_diverged_tooltip_message }}
= icon('exclamation-triangle') = icon('exclamation-triangle')
This branch has diverged from upstream. This branch has diverged from upstream.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment