diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-09-13 05:08:58 +0300 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-09-13 22:29:29 +0300 |
| commit | 42d2dfad8f8c4c82d40ad5a300ebb8d0ab9d6a7a (patch) | |
| tree | 570042751ff8c996546cfd015d9f5d93e5d8f843 /app/assets/javascripts/vue_merge_request_widget | |
| parent | f06d370b20ffbb7b8dba83b841df053b39cf3b1a (diff) | |
Fix MR ready to merge buttons/controls at mobile breakpoint
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37259
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js index 65187754009..1fb7150d20e 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js @@ -202,8 +202,8 @@ export default { <div class="mr-widget-body media"> <status-icon status="success" /> <div class="media-body"> - <div class="media space-children"> - <span class="btn-group"> + <div class="mr-widget-body-controls media space-children"> + <span class="btn-group append-bottom-5"> <button @click="handleMergeButtonClick()" :disabled="isMergeButtonDisabled" @@ -260,7 +260,7 @@ export default { </li> </ul> </span> - <div class="media-body space-children"> + <div class="media-body-wrap space-children"> <template v-if="isMergeAllowed()"> <label> <input |