summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-03-11 09:11:36 +0000
committerPhil Hughes <me@iamphill.com>2016-03-11 09:11:36 +0000
commit57a9d07716b39206c683430ef65d00af32fd9811 (patch)
tree370e41d1baf29048612ccdd2bf92c8aa763daac1
parentcb72f9b30cd524cb238f3462cfbcb2ee90dee146 (diff)
downloadgitlab-ce-57a9d07716b39206c683430ef65d00af32fd9811.tar.gz
Fixed bug with emoji search styling
-rw-r--r--app/assets/javascripts/awards_handler.coffee4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 13b4a7e05e9..da102db39c2 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -185,13 +185,13 @@ class @AwardsHandler
term = $(ev.target).val()
# Clean previous search results
- $("ul.emoji-search,h5.emoji-search").remove()
+ $("ul.emoji-menu-search, h5.emoji-search").remove()
if term
# Generate a search result block
h5 = $("<h5>").text("Search results").addClass("emoji-search")
found_emojis = @searchEmojis(term).show()
- ul = $("<ul>").addClass("emoji-search").append(found_emojis)
+ ul = $("<ul>").addClass("emoji-menu-list emoji-menu-search").append(found_emojis)
$(".emoji-menu-content ul, .emoji-menu-content h5").hide()
$(".emoji-menu-content").append(h5).append(ul)
else