Automatic merge of gitlab-org/gitlab-ce master

635c4940 · GitLab Bot · 283d46fe · accf4631 · 635c4940 · 635c4940
Commit 635c4940 authored Jan 11, 2019 by GitLab Bot
2 changed files
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -596,6 +596,10 @@
  .emoji-menu-toggle-button {
    @include emoji-menu-toggle-button;
  }
+
+  .input-group {
+    height: 34px;
+  }
 }

 .nav-links > li > a {

--- a/changelogs/unreleased/55884-adjust-emoji-and-cancel-buttons-height-in-user-status-modal-when-emoji-is-changed.yml
+++ b/changelogs/unreleased/55884-adjust-emoji-and-cancel-buttons-height-in-user-status-modal-when-emoji-is-changed.yml
+---
+title: Emoji and cancel button are taller than input in set user status modal
+merge_request: 24173
+author: Dhiraj Bodicherla
+type: fixed