diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-27 21:03:08 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-27 21:03:08 +0300 |
| commit | e0e325625eb141445720999d4e4a4d60a4b59d95 (patch) | |
| tree | 5d63c010ab3c185109fff7f1511d54e9818d1dc7 /spec/javascripts | |
| parent | c3a8b252cdf569729e5e1e8e0614b4d2e5226371 (diff) | |
| parent | a531af64e588bc644243ea06e16934574d7a885d (diff) | |
Merge branch 'emoji-menu-stick-search' into 'master'
Made the search bar on emoji menu sticky
## What does this MR do?
When scrolling down the emoji menu, the search bar disappears. For better UX, the search bar no stays at the top when scrolling.
## Screenshots (if relevant)
See merge request !4743
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/awards_handler_spec.js.coffee | 1 | ||||
| -rw-r--r-- | spec/javascripts/fixtures/emoji_menu.coffee | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/spec/javascripts/awards_handler_spec.js.coffee b/spec/javascripts/awards_handler_spec.js.coffee index ba191199dc7..d7f9c6fc076 100644 --- a/spec/javascripts/awards_handler_spec.js.coffee +++ b/spec/javascripts/awards_handler_spec.js.coffee @@ -160,7 +160,6 @@ describe 'AwardsHandler', -> expect($('[data-emoji=angel]').is(':visible')).toBe no expect($('[data-emoji=anger]').is(':visible')).toBe no expect($('[data-emoji=alien]').is(':visible')).toBe yes - expect($('h5.emoji-search').is(':visible')).toBe yes describe 'emoji menu', -> diff --git a/spec/javascripts/fixtures/emoji_menu.coffee b/spec/javascripts/fixtures/emoji_menu.coffee index e529dd5f1cd..ce1a41390d2 100644 --- a/spec/javascripts/fixtures/emoji_menu.coffee +++ b/spec/javascripts/fixtures/emoji_menu.coffee @@ -1,7 +1,7 @@ window.emojiMenu = """ <div class='emoji-menu'> + <input type="text" name="emoji_search" id="emoji_search" value="" class="emoji-search search-input form-control" /> <div class='emoji-menu-content'> - <input type="text" name="emoji_search" id="emoji_search" value="" class="emoji-search search-input form-control" /> <h5 class='emoji-menu-title'> Emoticons </h5> |