home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 10:06:04 +10:00
Code Issues Packages Projects Releases Wiki Activity

Tooltip placement on award buttons

Browse Source
This commit is contained in:
Phil Hughes
2016-05-19 14:12:59 -05:00
committed by Fatih Acet
parent f6a7b3c37a
commit 797acde046
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/awards_handler.coffee
+1 -1
View File
@@ -145,7 +145,7 @@ class @AwardsHandler
createEmoji: (emoji) ->
emojiCssClass = @resolveNameToCssClass(emoji)
buttonHtml = "<button class='btn award-control js-emoji-btn has-tooltip active' title='me'>
buttonHtml = "<button class='btn award-control js-emoji-btn has-tooltip active' title='me' data-placement='bottom'>
<div class='icon emoji-icon #{emojiCssClass}' data-emoji='#{emoji}'></div>
<span class='award-control-text js-counter'>1</span>
</button>"
app/assets/stylesheets/pages/notes.scss
+1
View File
@@ -319,6 +319,7 @@ ul.notes {
.award-control {
padding-top: 2px;
padding-bottom: 2px;
color: #8f8f8f;
font-size: 13px;
}
}
app/views/emoji_awards/_awards_block.html.haml
+1 -1
View File
@@ -1,7 +1,7 @@
- grouped_emojis = awardable.grouped_awards(inline)
.awards.js-awards-block{ class: ("hidden" if !inline && grouped_emojis.size == 0), data: { award_url: url_for([:toggle_emoji_award, @project.namespace.becomes(Namespace), @project, awardable]) } }
- awards_sort(grouped_emojis).each do |emoji, awards|
%button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)), title: award_user_list(awards, current_user) }
%button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)), title: award_user_list(awards, current_user), data: { placement: "bottom" } }
= emoji_icon(emoji)
%span.award-control-text.js-counter
= awards.count