Skip to content

Commit 4ab23d4

Browse files
committed
split merge section with status check on pull view ui
1 parent ea4a087 commit 4ab23d4

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

public/css/index.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,7 @@ footer .ui.left,footer .ui.right{line-height:40px}
535535
.repository.view.issue .comment-list .comment .content>.header:before{border-right-color:#d3d3d4;border-width:9px;margin-top:-9px}
536536
.repository.view.issue .comment-list .comment .content>.header:after{border-right-color:#f7f7f7;border-width:8px;margin-top:-8px}
537537
.repository.view.issue .comment-list .comment .content>.header .text{max-width:78%;padding-top:10px;padding-bottom:10px}
538+
.repository.view.issue .comment-list .comment .content>.merge-section{border-top:1px solid #d4d4d5;background-color:#f7f7f7}
538539
.repository.view.issue .comment-list .comment .content .markdown{font-size:14px}
539540
.repository.view.issue .comment-list .comment .content .no-content{color:#767676;font-style:italic}
540541
.repository.view.issue .comment-list .comment .content>.bottom.segment{background:#f3f4f5}

public/less/_repository.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -813,6 +813,11 @@
813813
}
814814
}
815815

816+
> .merge-section {
817+
border-top: 1px solid #d4d4d5;
818+
background-color: #f7f7f7;
819+
}
820+
816821
.markdown {
817822
font-size: 14px;
818823
}

templates/repo/issue/view_content/pull.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
{{else}}red{{end}}"><span class="mega-octicon octicon-git-merge"></span></a>
4747
<div class="content">
4848
{{template "repo/pulls/status" .}}
49-
<div class="ui attached merge segment">
49+
<div class="ui attached merge-section segment">
5050
{{if .Issue.PullRequest.HasMerged}}
5151
<div class="item text purple">
5252
{{$.i18n.Tr "repo.pulls.has_merged"}}

0 commit comments

Comments
 (0)