diff options
| author | Phil Hughes <me@iamphill.com> | 2018-07-02 10:33:02 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-07-05 15:44:53 +0100 |
| commit | 3b9bb25dfe3b30d183f916672c228ac7574b3933 (patch) | |
| tree | 30d521dd51c3d2fe60c47cabd77687dae7be409c | |
| parent | d75ca92203c477df9129e9d702da94edaafc3001 (diff) | |
| download | gitlab-ce-3b9bb25dfe3b30d183f916672c228ac7574b3933.tar.gz | |
update design
| -rw-r--r-- | app/assets/javascripts/ide/components/merge_requests/info.vue | 45 |
1 files changed, 12 insertions, 33 deletions
diff --git a/app/assets/javascripts/ide/components/merge_requests/info.vue b/app/assets/javascripts/ide/components/merge_requests/info.vue index 62cfa4f9af5..05a2d1a0ccd 100644 --- a/app/assets/javascripts/ide/components/merge_requests/info.vue +++ b/app/assets/javascripts/ide/components/merge_requests/info.vue @@ -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" - /> - </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> + <icon + name="git-merge" + class="align-self-center append-right-8" + /> + <strong> + !{{ currentMergeRequest.iid }} + </strong> </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> |