diff --git a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html index 3dd8c07..9ee0a11 100644 --- a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html @@ -13,13 +13,12 @@ @if(!status.statuses.isEmpty){
@defining(status.commitStateSummary){ case (summaryState, summary) => -
- - @commitStateIcon(summaryState) - @commitStateText(summaryState, pullreq.commitIdTo) - — @summary checks -
+ + @commitStateIcon(summaryState) + @commitStateText(summaryState, pullreq.commitIdTo) + — @summary checks } +
@status.statusesAndRequired.map{ case (status, required) =>
@@ -33,7 +32,6 @@
}
- }
@if(status.hasConflict){ diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 62af1a8..59192a4 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -1139,22 +1139,21 @@ font-size: 12px; } -.text-pending{ +.text-pending { color: #cea61b; } -.text-failure{ +.text-failure { color: #bd2c00; } -.build-statuses{ - margin: -10px -10px 10px -10px; -} -.build-statuses .build-status-item{ - padding: 10px 15px 10px 64px; +.build-statuses { + padding: 10px 15px 10px 15px; border-bottom: 1px solid #eee; } -.build-statuses-list .build-status-item{ +.build-statuses-list .build-status-item { background-color: #fafafa; + padding: 10px 15px 10px 15px; + border-bottom: 1px solid #eee; } .merge-indicator{