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
3b9bb25d
Commit
3b9bb25d
authored
Jul 02, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update design
parent
d75ca922
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
33 deletions
+12
-33
app/assets/javascripts/ide/components/merge_requests/info.vue
...assets/javascripts/ide/components/merge_requests/info.vue
+12
-33
No files found.
app/assets/javascripts/ide/components/merge_requests/info.vue
View file @
3b9bb25d
...
...
@@ -42,39 +42,13 @@ export default {
<
template
>
<div
class=
"ide-merge-request-info"
>
<div
class=
"detail-page-header"
>
<div
class=
"detail-page-header-body"
>
<div
:class=
"
{
'status-box-open': isOpen,
'status-box-closed': isClosed
}"
class="issuable-status-box status-box d-flex h-100"
>
<icon
:name=
"iconName"
name=
"git-merge"
class=
"align-self-center append-right-8"
/>
</div>
<div
class=
"issuable-meta"
>
Opened
{{
timeFormated
(
currentMergeRequest
.
created_at
)
}}
by
<a
:href=
"currentMergeRequest.author.web_url"
class=
"author_link"
>
<img
:src=
"currentMergeRequest.author.avatar_url"
class=
"avatar avatar-inline s24"
/>
<strong
v-tooltip
:title=
"authorUsername"
>
{{
currentMergeRequest
.
author
.
name
}}
<strong>
!
{{
currentMergeRequest
.
iid
}}
</strong>
</a>
</div>
</div>
</div>
<div
class=
"issuable-details"
>
<title-component
...
...
@@ -85,6 +59,7 @@ export default {
<description-component
:description-html=
"currentMergeRequest.description"
:description-text=
"currentMergeRequest.description"
:can-update=
"false"
/>
</div>
</div>
...
...
@@ -94,4 +69,8 @@ export default {
.ide-merge-request-info
{
overflow
:
auto
;
}
.detail-page-header
{
line-height
:
initial
;
}
</
style
>
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