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
271769a9
Commit
271769a9
authored
May 20, 2019
by
Heinrich Lee Yu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix MR widget padding
Align elements horizontally and add missing bottom padding
parent
a4777d6e
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
50 additions
and
37 deletions
+50
-37
app/assets/javascripts/vue_merge_request_widget/components/source_branch_removal_status.vue
...equest_widget/components/source_branch_removal_status.vue
+1
-1
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
...avascripts/vue_merge_request_widget/mr_widget_options.vue
+35
-31
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+9
-5
changelogs/unreleased/58632-fix-mr-widget-padding.yml
changelogs/unreleased/58632-fix-mr-widget-padding.yml
+5
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/source_branch_removal_status.vue
View file @
271769a9
...
...
@@ -14,7 +14,7 @@ export default {
</
script
>
<
template
>
<p
v-once
class=
"mr-info-list mr-links
source-branch-removal-status
append-bottom-0"
>
<p
v-once
class=
"mr-info-list mr-links append-bottom-0"
>
<span
class=
"status-text"
v-html=
"removesBranchText"
>
</span>
<i
v-tooltip
:title=
"tooltipTitle"
:aria-label=
"tooltipTitle"
class=
"fa fa-question-circle"
>
</i>
...
...
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
View file @
271769a9
...
...
@@ -333,8 +333,11 @@ export default {
<div
class=
"mr-widget-section"
>
<component
:is=
"componentName"
:mr=
"mr"
:service=
"service"
/>
<div
class=
"mr-widget-info"
>
<section
v-if=
"shouldRenderCollaborationStatus"
class=
"mr-info-list mr-links"
>
<p>
{{
s__
(
'
mrWidget|Allows commits from members who can merge to the target branch
'
)
}}
</p>
</section>
<mr-widget-related-links
...
...
@@ -369,6 +372,7 @@ export default {
<source-branch-removal-status
v-if=
"shouldRenderSourceBranchRemovalStatus"
/>
</div>
</div>
<div
v-if=
"shouldRenderMergeHelp"
class=
"mr-widget-footer"
><mr-widget-merge-help
/></div>
</div>
<mr-widget-pipeline-container
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
271769a9
...
...
@@ -87,6 +87,11 @@
padding
:
$gl-padding
;
}
.mr-widget-info
{
padding-left
:
$gl-padding-50
-
$gl-padding-32
;
padding-right
:
$gl-padding
;
}
.mr-state-widget
{
color
:
$gl-text-color
;
...
...
@@ -560,6 +565,10 @@
.mr-links
{
padding-left
:
$status-icon-size
+
$gl-btn-padding
;
&
:last-child
{
padding-bottom
:
$gl-padding
;
}
}
.mr-info-list
{
...
...
@@ -1034,11 +1043,6 @@
background
:
$black-transparent
;
}
.source-branch-removal-status
{
padding-left
:
50px
;
padding-bottom
:
$gl-padding
;
}
.mr-compare
{
.diff-file
.file-title-flex-parent
{
top
:
$header-height
+
51px
;
...
...
changelogs/unreleased/58632-fix-mr-widget-padding.yml
0 → 100644
View file @
271769a9
---
title
:
Fix padding in MR widget
merge_request
:
28472
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