Commit 271769a9 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Fix MR widget padding

Align elements horizontally and add missing bottom padding
parent a4777d6e
...@@ -14,7 +14,7 @@ export default { ...@@ -14,7 +14,7 @@ export default {
</script> </script>
<template> <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> <span class="status-text" v-html="removesBranchText"> </span>
<i v-tooltip :title="tooltipTitle" :aria-label="tooltipTitle" class="fa fa-question-circle"> <i v-tooltip :title="tooltipTitle" :aria-label="tooltipTitle" class="fa fa-question-circle">
</i> </i>
......
...@@ -333,8 +333,11 @@ export default { ...@@ -333,8 +333,11 @@ export default {
<div class="mr-widget-section"> <div class="mr-widget-section">
<component :is="componentName" :mr="mr" :service="service" /> <component :is="componentName" :mr="mr" :service="service" />
<div class="mr-widget-info">
<section v-if="shouldRenderCollaborationStatus" class="mr-info-list mr-links"> <section v-if="shouldRenderCollaborationStatus" class="mr-info-list mr-links">
<p>
{{ s__('mrWidget|Allows commits from members who can merge to the target branch') }} {{ s__('mrWidget|Allows commits from members who can merge to the target branch') }}
</p>
</section> </section>
<mr-widget-related-links <mr-widget-related-links
...@@ -369,6 +372,7 @@ export default { ...@@ -369,6 +372,7 @@ export default {
<source-branch-removal-status v-if="shouldRenderSourceBranchRemovalStatus" /> <source-branch-removal-status v-if="shouldRenderSourceBranchRemovalStatus" />
</div> </div>
</div>
<div v-if="shouldRenderMergeHelp" class="mr-widget-footer"><mr-widget-merge-help /></div> <div v-if="shouldRenderMergeHelp" class="mr-widget-footer"><mr-widget-merge-help /></div>
</div> </div>
<mr-widget-pipeline-container <mr-widget-pipeline-container
......
...@@ -87,6 +87,11 @@ ...@@ -87,6 +87,11 @@
padding: $gl-padding; padding: $gl-padding;
} }
.mr-widget-info {
padding-left: $gl-padding-50 - $gl-padding-32;
padding-right: $gl-padding;
}
.mr-state-widget { .mr-state-widget {
color: $gl-text-color; color: $gl-text-color;
...@@ -560,6 +565,10 @@ ...@@ -560,6 +565,10 @@
.mr-links { .mr-links {
padding-left: $status-icon-size + $gl-btn-padding; padding-left: $status-icon-size + $gl-btn-padding;
&:last-child {
padding-bottom: $gl-padding;
}
} }
.mr-info-list { .mr-info-list {
...@@ -1034,11 +1043,6 @@ ...@@ -1034,11 +1043,6 @@
background: $black-transparent; background: $black-transparent;
} }
.source-branch-removal-status {
padding-left: 50px;
padding-bottom: $gl-padding;
}
.mr-compare { .mr-compare {
.diff-file .file-title-flex-parent { .diff-file .file-title-flex-parent {
top: $header-height + 51px; top: $header-height + 51px;
......
---
title: Fix padding in MR widget
merge_request: 28472
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment