Merge branch '37259-some-mr-ready-mobile-fixes' into 'master'
Fix MR widget with ready to merge buttons/controls at mobile breakpoint Closes #37259 See merge request gitlab-org/gitlab-ce!14242
This commit is contained in:
commit
f0b089cf78
|
@ -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
|
||||
|
|
|
@ -6,3 +6,7 @@
|
|||
.media-body {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.media-body-wrap {
|
||||
flex-grow: 1;
|
||||
}
|
||||
|
|
|
@ -356,6 +356,10 @@
|
|||
}
|
||||
}
|
||||
|
||||
.mr-widget-body-controls {
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.mr_source_commit,
|
||||
.mr_target_commit {
|
||||
margin-bottom: 0;
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix MR ready to merge buttons/controls at mobile breakpoint
|
||||
merge_request: 14242
|
||||
author:
|
||||
type: fixed
|
Loading…
Reference in New Issue