Commit 2da0af68 authored by Paul Gascou-Vaillancourt's avatar Paul Gascou-Vaillancourt Committed by Fatih Acet

Fix input group and action buttons in "set status" modal

parent 0be6392d
...@@ -178,7 +178,7 @@ export default { ...@@ -178,7 +178,7 @@ export default {
/> />
<div ref="userStatusForm" class="form-group position-relative m-0"> <div ref="userStatusForm" class="form-group position-relative m-0">
<div class="input-group"> <div class="input-group">
<span class="input-group-btn"> <span class="input-group-prepend">
<button <button
ref="toggleEmojiMenuButton" ref="toggleEmojiMenuButton"
v-gl-tooltip.bottom v-gl-tooltip.bottom
...@@ -211,7 +211,7 @@ export default { ...@@ -211,7 +211,7 @@ export default {
@keyup.enter.prevent @keyup.enter.prevent
@click="hideEmojiMenu" @click="hideEmojiMenu"
/> />
<span v-show="isDirty" class="input-group-btn"> <span v-show="isDirty" class="input-group-append">
<button <button
v-gl-tooltip.bottom v-gl-tooltip.bottom
:title="s__('SetStatusModal|Clear status')" :title="s__('SetStatusModal|Clear status')"
......
...@@ -581,10 +581,15 @@ ...@@ -581,10 +581,15 @@
.emoji-menu-toggle-button { .emoji-menu-toggle-button {
@include emoji-menu-toggle-button; @include emoji-menu-toggle-button;
padding: $gl-vert-padding $gl-btn-padding;
} }
.input-group { .input-group {
height: 34px; &,
.input-group-prepend,
.input-group-append {
height: $input-height;
}
} }
} }
......
...@@ -66,12 +66,6 @@ ...@@ -66,12 +66,6 @@
margin-top: $grid-size; margin-top: $grid-size;
} }
} }
@include media-breakpoint-up(sm) {
.btn:nth-child(1) {
margin-left: auto;
}
}
} }
body.modal-open { body.modal-open {
......
---
title: Fix visual issues in set status modal
merge_request: 28147
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment