diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-12-22 23:27:05 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-12-22 23:27:05 +0200 |
| commit | 44d8714f38cd09c0a11837531c003b16a121bd0c (patch) | |
| tree | 6ebee17d775b03b1c3c84217b4af7ed268dcae7b | |
| parent | a56d357be0f041d90b19c17d8fbce37c7b5ee840 (diff) | |
| download | gitlab-ce-improve_emoji_picker.tar.gz | |
improved emoji picker styleimprove_emoji_picker
| -rw-r--r-- | app/assets/stylesheets/pages/awards.scss | 4 | ||||
| -rw-r--r-- | app/views/votes/_votes_block.html.haml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss index 30fdf3f218d..aa1a06b2fcc 100644 --- a/app/assets/stylesheets/pages/awards.scss +++ b/app/assets/stylesheets/pages/awards.scss @@ -90,13 +90,15 @@ height: 300px; overflow-y: scroll; - h4 { + h5 { clear: left; } ul { list-style-type: none; margin-left: -20px; + margin-bottom: 20px; + overflow: auto; } li { diff --git a/app/views/votes/_votes_block.html.haml b/app/views/votes/_votes_block.html.haml index 65d3f4c7faf..8c660ba16cc 100644 --- a/app/views/votes/_votes_block.html.haml +++ b/app/views/votes/_votes_block.html.haml @@ -12,7 +12,7 @@ .emoji-menu .emoji-menu-content - AwardEmoji.emoji_by_category.each do |category, emojis| - %h4= AwardEmoji::CATEGORIES[category] + %h5= AwardEmoji::CATEGORIES[category] %ul - emojis.each do |emoji| %li |