summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-04-05 10:56:40 +0100
committerPhil Hughes <me@iamphill.com>2017-04-05 10:56:40 +0100
commitab79c76d0c73c282d519b9bc09956dd494ea2bff (patch)
treee944f397edac5a1a056cfb53d68c4a1a00a35f03
parent65ea732cfebd7efe5a0ae9b31eef4349c38cfa4b (diff)
downloadgitlab-ce-ab79c76d0c73c282d519b9bc09956dd494ea2bff.tar.gz
Removes the duplicated search icon in emoji menuemoji-menu-duplicated-search-icon
The search emojis title had the same class as the search input which caused a duplicated icon. Closes #30416
-rw-r--r--app/assets/javascripts/awards_handler.js4
-rw-r--r--changelogs/unreleased/emoji-menu-duplicated-search-icon.yml4
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index c743dd551d7..4f63c7988f5 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -476,10 +476,10 @@ AwardsHandler.prototype.setupSearch = function setupSearch() {
this.registerEventListener('on', $('input.emoji-search'), 'input', (e) => {
const term = $(e.target).val().trim();
// Clean previous search results
- $('ul.emoji-menu-search, h5.emoji-search').remove();
+ $('ul.emoji-menu-search, h5.emoji-search-title').remove();
if (term.length > 0) {
// Generate a search result block
- const h5 = $('<h5 class="emoji-search" />').text('Search results');
+ const h5 = $('<h5 class="emoji-search-title"/>').text('Search results');
const foundEmojis = this.searchEmojis(term).show();
const ul = $('<ul>').addClass('emoji-menu-list emoji-menu-search').append(foundEmojis);
$('.emoji-menu-content ul, .emoji-menu-content h5').hide();
diff --git a/changelogs/unreleased/emoji-menu-duplicated-search-icon.yml b/changelogs/unreleased/emoji-menu-duplicated-search-icon.yml
new file mode 100644
index 00000000000..4ab6ba5399c
--- /dev/null
+++ b/changelogs/unreleased/emoji-menu-duplicated-search-icon.yml
@@ -0,0 +1,4 @@
+---
+title: Removed the duplicated search icon in the award emoji menu
+merge_request:
+author: