Commit a9f4305d authored by Phil Hughes's avatar Phil Hughes

Merge branch '336465_fix_upvote_tooltip' into 'master'

Global Search - Upvote Tooltip Alignment

See merge request gitlab-org/gitlab!71226
parents 04855663 08e0e2c0
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
= highlight_and_truncate_issuable(issuable, @search_term, @search_highlight) = highlight_and_truncate_issuable(issuable, @search_term, @search_highlight)
.col-sm-3.gl-mt-3.gl-sm-mt-0.gl-text-right .col-sm-3.gl-mt-3.gl-sm-mt-0.gl-text-right
- if issuable.respond_to?(:upvotes_count) && issuable.upvotes_count > 0 - if issuable.respond_to?(:upvotes_count) && issuable.upvotes_count > 0
%li.issuable-upvotes.gl-list-style-none.has-tooltip{ title: _('Upvotes') } %li.issuable-upvotes.gl-list-style-none
= sprite_icon('thumb-up', css_class: "gl-vertical-align-middle") %span.has-tooltip{ title: _('Upvotes') }
= issuable.upvotes_count = sprite_icon('thumb-up', css_class: "gl-vertical-align-middle")
= issuable.upvotes_count
%span.gl-text-gray-500= sprintf(s_('updated %{time_ago}'), { time_ago: time_ago_with_tooltip(issuable.updated_at, placement: 'bottom') }).html_safe %span.gl-text-gray-500= sprintf(s_('updated %{time_ago}'), { time_ago: time_ago_with_tooltip(issuable.updated_at, placement: 'bottom') }).html_safe
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