Commit d1adb71d authored by Yogi's avatar Yogi Committed by David O'Regan

Apply GitLab UI for create file button in MR

parent 5f5076a0
<script>
/* eslint-disable vue/no-v-html */
import emptyStateSVG from 'icons/_mr_widget_empty_state.svg';
import { GlButton } from '@gitlab/ui';
export default {
name: 'MRWidgetNothingToMerge',
components: {
GlButton,
},
props: {
mr: {
type: Object,
......@@ -25,11 +29,13 @@ export default {
<span v-html="emptyStateSVG"></span>
</div>
<div class="text col-md-7 order-md-first col-12">
<span>{{
s__(
'mrWidgetNothingToMerge|Merge requests are a place to propose changes you have made to a project and discuss those changes with others.',
)
}}</span>
<p class="highlight">
{{
s__(
'mrWidgetNothingToMerge|Merge requests are a place to propose changes you have made to a project and discuss those changes with others.',
)
}}
</p>
<p>
{{
s__(
......@@ -45,9 +51,14 @@ export default {
}}
</p>
<div>
<a v-if="mr.newBlobPath" :href="mr.newBlobPath" class="btn btn-inverted btn-success">{{
__('Create file')
}}</a>
<gl-button
v-if="mr.newBlobPath"
:href="mr.newBlobPath"
category="secondary"
variant="success"
>
{{ __('Create file') }}
</gl-button>
</div>
</div>
</div>
......
......@@ -375,13 +375,14 @@ $mr-widget-min-height: 69px;
}
.text {
span {
font-weight: $gl-font-weight-bold;
}
p {
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