diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-01-12 02:17:26 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-01-12 02:17:26 +0300 |
| commit | accf4631f7304332fa58d2964f9a4775711b3234 (patch) | |
| tree | ecc4c1b705d990d833d2224745577ffa6bb924e6 | |
| parent | f5dd9107363b7376325712f973339c7fde036ef2 (diff) | |
| parent | 118edd2d537bdc3b5cd80a4112d4865a17956568 (diff) | |
Merge branch '55884-adjust-emoji-and-cancel-buttons-height-in-user-status-modal-when-emoji-is-changed' into 'master'
Adjust emoji and cancel buttons height in user status modal when emoji is changed
Closes #55884
See merge request gitlab-org/gitlab-ce!24173
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/55884-adjust-emoji-and-cancel-buttons-height-in-user-status-modal-when-emoji-is-changed.yml | 5 |
2 files changed, 9 insertions, 0 deletions
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 |