From 118edd2d537bdc3b5cd80a4112d4865a17956568 Mon Sep 17 00:00:00 2001 From: Dhiraj Bodicherla Date: Sat, 5 Jan 2019 22:00:31 -0800 Subject: [PATCH] Emoji and cancel button are taller than input in set user status modal --- app/assets/stylesheets/framework/header.scss | 4 ++++ ...ons-height-in-user-status-modal-when-emoji-is-changed.yml | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 changelogs/unreleased/55884-adjust-emoji-and-cancel-buttons-height-in-user-status-modal-when-emoji-is-changed.yml diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 5574873fa22..36dd1cee4de 100644 --- 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 { diff --git 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 new file mode 100644 index 00000000000..2fbf334f5e9 --- /dev/null +++ b/changelogs/unreleased/55884-adjust-emoji-and-cancel-buttons-height-in-user-status-modal-when-emoji-is-changed.yml @@ -0,0 +1,5 @@ +--- +title: Emoji and cancel button are taller than input in set user status modal +merge_request: 24173 +author: Dhiraj Bodicherla +type: fixed