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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
d1adb71d
Commit
d1adb71d
authored
Jan 26, 2021
by
Yogi
Committed by
David O'Regan
Jan 26, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply GitLab UI for create file button in MR
parent
5f5076a0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
12 deletions
+29
-12
app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue
...rge_request_widget/components/states/nothing_to_merge.vue
+19
-8
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+5
-4
changelogs/unreleased/yo-gl-button-create-file-mr.yml
changelogs/unreleased/yo-gl-button-create-file-mr.yml
+5
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue
View file @
d1adb71d
<
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>
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
d1adb71d
...
...
@@ -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
;
}
}
}
...
...
changelogs/unreleased/yo-gl-button-create-file-mr.yml
0 → 100644
View file @
d1adb71d
---
title
:
Apply GitLab UI for create file button in MR
merge_request
:
51795
author
:
Yogi (@yo)
type
:
other
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