Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
42d2dfad
Commit
42d2dfad
authored
Sep 12, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix MR ready to merge buttons/controls at mobile breakpoint
Fix
https://gitlab.com/gitlab-org/gitlab-ce/issues/37259
parent
f06d370b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
3 deletions
+16
-3
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
...uest_widget/components/states/mr_widget_ready_to_merge.js
+3
-3
app/assets/stylesheets/framework/media_object.scss
app/assets/stylesheets/framework/media_object.scss
+4
-0
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+4
-0
changelogs/unreleased/37259-some-mr-ready-mobile-fixes.yml
changelogs/unreleased/37259-some-mr-ready-mobile-fixes.yml
+5
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
View file @
42d2dfad
...
...
@@ -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="m
r-widget-body-controls m
edia 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
...
...
app/assets/stylesheets/framework/media_object.scss
View file @
42d2dfad
...
...
@@ -6,3 +6,7 @@
.media-body
{
flex
:
1
;
}
.media-body-wrap
{
flex-grow
:
1
;
}
app/assets/stylesheets/pages/merge_requests.scss
View file @
42d2dfad
...
...
@@ -356,6 +356,10 @@
}
}
.mr-widget-body-controls
{
flex-wrap
:
wrap
;
}
.mr_source_commit
,
.mr_target_commit
{
margin-bottom
:
0
;
...
...
changelogs/unreleased/37259-some-mr-ready-mobile-fixes.yml
0 → 100644
View file @
42d2dfad
---
title
:
Fix MR ready to merge buttons/controls at mobile breakpoint
merge_request
:
14242
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment