Commit 3b9bb25d authored by Phil Hughes's avatar Phil Hughes

update design

parent d75ca922
...@@ -42,39 +42,13 @@ export default { ...@@ -42,39 +42,13 @@ export default {
<template> <template>
<div class="ide-merge-request-info"> <div class="ide-merge-request-info">
<div class="detail-page-header"> <div class="detail-page-header">
<div class="detail-page-header-body"> <icon
<div name="git-merge"
:class="{ class="align-self-center append-right-8"
'status-box-open': isOpen, />
'status-box-closed': isClosed <strong>
}" !{{ currentMergeRequest.iid }}
class="issuable-status-box status-box d-flex h-100" </strong>
>
<icon
:name="iconName"
/>
</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>
</a>
</div>
</div>
</div> </div>
<div class="issuable-details"> <div class="issuable-details">
<title-component <title-component
...@@ -85,6 +59,7 @@ export default { ...@@ -85,6 +59,7 @@ export default {
<description-component <description-component
:description-html="currentMergeRequest.description" :description-html="currentMergeRequest.description"
:description-text="currentMergeRequest.description" :description-text="currentMergeRequest.description"
:can-update="false"
/> />
</div> </div>
</div> </div>
...@@ -94,4 +69,8 @@ export default { ...@@ -94,4 +69,8 @@ export default {
.ide-merge-request-info { .ide-merge-request-info {
overflow: auto; overflow: auto;
} }
.detail-page-header {
line-height: initial;
}
</style> </style>
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