diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-05-07 22:02:26 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-05-07 22:02:26 +0000 |
| commit | e5cf03c616a5c5ce7481518da3f742e35a80df3a (patch) | |
| tree | a2e1dec5706468716b4593fed8044eb74ede81f2 | |
| parent | 0be6392d8fce811ad607c6fdfbda8c6b6f70b325 (diff) | |
| parent | 2da0af68552ce89edf4dd344c2160cc0da04441a (diff) | |
| download | gitlab-ce-e5cf03c616a5c5ce7481518da3f742e35a80df3a.tar.gz | |
Merge branch '61494-set-status-modal-visual-bugs' into 'master'
Fix input group and action buttons in "set status" modal
Closes #61494
See merge request gitlab-org/gitlab-ce!28147
4 files changed, 13 insertions, 9 deletions
diff --git a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue index c0659a0173a..10e2c8453e2 100644 --- a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue +++ b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue @@ -178,7 +178,7 @@ export default { /> <div ref="userStatusForm" class="form-group position-relative m-0"> <div class="input-group"> - <span class="input-group-btn"> + <span class="input-group-prepend"> <button ref="toggleEmojiMenuButton" v-gl-tooltip.bottom @@ -211,7 +211,7 @@ export default { @keyup.enter.prevent @click="hideEmojiMenu" /> - <span v-show="isDirty" class="input-group-btn"> + <span v-show="isDirty" class="input-group-append"> <button v-gl-tooltip.bottom :title="s__('SetStatusModal|Clear status')" diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index a6179e2a96e..a57cd6737f8 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -581,10 +581,15 @@ .emoji-menu-toggle-button { @include emoji-menu-toggle-button; + padding: $gl-vert-padding $gl-btn-padding; } .input-group { - height: 34px; + &, + .input-group-prepend, + .input-group-append { + height: $input-height; + } } } diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index 323a3dbecd5..e2bb1eb67c0 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -66,12 +66,6 @@ margin-top: $grid-size; } } - - @include media-breakpoint-up(sm) { - .btn:nth-child(1) { - margin-left: auto; - } - } } body.modal-open { diff --git a/changelogs/unreleased/61494-set-status-modal-visual-bugs.yml b/changelogs/unreleased/61494-set-status-modal-visual-bugs.yml new file mode 100644 index 00000000000..4126b8f93c1 --- /dev/null +++ b/changelogs/unreleased/61494-set-status-modal-visual-bugs.yml @@ -0,0 +1,5 @@ +--- +title: Fix visual issues in set status modal +merge_request: 28147 +author: +type: fixed |