Commit 9a0aa781 authored by David O'Regan's avatar David O'Regan

Merge branch 'yo-gl-button-create-file-mr' into 'master'

Apply GitLab UI for create file button in MR

See merge request gitlab-org/gitlab!51795
parents ee29b690 d1adb71d
<script> <script>
/* eslint-disable vue/no-v-html */ /* eslint-disable vue/no-v-html */
import emptyStateSVG from 'icons/_mr_widget_empty_state.svg'; import emptyStateSVG from 'icons/_mr_widget_empty_state.svg';
import { GlButton } from '@gitlab/ui';
export default { export default {
name: 'MRWidgetNothingToMerge', name: 'MRWidgetNothingToMerge',
components: {
GlButton,
},
props: { props: {
mr: { mr: {
type: Object, type: Object,
...@@ -25,11 +29,13 @@ export default { ...@@ -25,11 +29,13 @@ export default {
<span v-html="emptyStateSVG"></span> <span v-html="emptyStateSVG"></span>
</div> </div>
<div class="text col-md-7 order-md-first col-12"> <div class="text col-md-7 order-md-first col-12">
<span>{{ <p class="highlight">
{{
s__( s__(
'mrWidgetNothingToMerge|Merge requests are a place to propose changes you have made to a project and discuss those changes with others.', 'mrWidgetNothingToMerge|Merge requests are a place to propose changes you have made to a project and discuss those changes with others.',
) )
}}</span> }}
</p>
<p> <p>
{{ {{
s__( s__(
...@@ -45,9 +51,14 @@ export default { ...@@ -45,9 +51,14 @@ export default {
}} }}
</p> </p>
<div> <div>
<a v-if="mr.newBlobPath" :href="mr.newBlobPath" class="btn btn-inverted btn-success">{{ <gl-button
__('Create file') v-if="mr.newBlobPath"
}}</a> :href="mr.newBlobPath"
category="secondary"
variant="success"
>
{{ __('Create file') }}
</gl-button>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -375,13 +375,14 @@ $mr-widget-min-height: 69px; ...@@ -375,13 +375,14 @@ $mr-widget-min-height: 69px;
} }
.text { .text {
span {
font-weight: $gl-font-weight-bold;
}
p { p {
margin-top: $gl-padding; margin-top: $gl-padding;
} }
.highlight {
margin: 0 0 $gl-padding;
font-weight: $gl-font-weight-bold;
}
} }
} }
......
---
title: Apply GitLab UI for create file button in MR
merge_request: 51795
author: Yogi (@yo)
type: other
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