diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-09-18 22:54:43 +0000 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-28 10:55:58 -0500 |
| commit | 610e1b6e37e81cfdc23e0f27e3de2b834fc2f35e (patch) | |
| tree | 715a1996047c73024858a49f0cd1d1c2fd2b78aa | |
| parent | 3cf5eba3d4d518b48b88331dd57d766046f42fff (diff) | |
| download | gitlab-ce-610e1b6e37e81cfdc23e0f27e3de2b834fc2f35e.tar.gz | |
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
4 files changed, 16 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 diff --git a/app/assets/stylesheets/framework/media_object.scss b/app/assets/stylesheets/framework/media_object.scss index b573052c14a..89c561479cc 100644 --- a/app/assets/stylesheets/framework/media_object.scss +++ b/app/assets/stylesheets/framework/media_object.scss @@ -6,3 +6,7 @@ .media-body { flex: 1; } + +.media-body-wrap { + flex-grow: 1; +} diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 31fce49e1f8..cb66cda2e67 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -367,6 +367,10 @@ } } +.mr-widget-body-controls { + flex-wrap: wrap; +} + .mr_source_commit, .mr_target_commit { margin-bottom: 0; diff --git a/changelogs/unreleased/37259-some-mr-ready-mobile-fixes.yml b/changelogs/unreleased/37259-some-mr-ready-mobile-fixes.yml new file mode 100644 index 00000000000..a00a41f567f --- /dev/null +++ b/changelogs/unreleased/37259-some-mr-ready-mobile-fixes.yml @@ -0,0 +1,5 @@ +--- +title: Fix MR ready to merge buttons/controls at mobile breakpoint +merge_request: 14242 +author: +type: fixed |