Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-12 08:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix pull request status styles

Browse Source
This commit is contained in:
Naoki Takezoe
2016-05-28 04:16:13 +09:00
parent f71acfcbe8
commit 23a5f7dcf9
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
View File

@@ -13,13 +13,12 @@
@if(!status.statuses.isEmpty){ @if(!status.statuses.isEmpty){
<div class="build-statuses"> <div class="build-statuses">
@defining(status.commitStateSummary){ case (summaryState, summary) => @defining(status.commitStateSummary){ case (summaryState, summary) =>
<div class="build-status-item-header">
<a class="pull-right" id="toggle-all-checks"></a> <a class="pull-right" id="toggle-all-checks"></a>
<span class="build-status-icon text-@{summaryState.name}">@commitStateIcon(summaryState)</span> <span class="build-status-icon text-@{summaryState.name}">@commitStateIcon(summaryState)</span>
<strong class="text-@{summaryState.name}">@commitStateText(summaryState, pullreq.commitIdTo)</strong> <strong class="text-@{summaryState.name}">@commitStateText(summaryState, pullreq.commitIdTo)</strong>
<span class="text-@{summaryState.name}">— @summary checks</span> <span class="text-@{summaryState.name}">— @summary checks</span>
</div>
} }
</div>
<div class="build-statuses-list" style="@if(status.isAllSuccess){ display:none; }else{ }"> <div class="build-statuses-list" style="@if(status.isAllSuccess){ display:none; }else{ }">
@status.statusesAndRequired.map{ case (status, required) => @status.statusesAndRequired.map{ case (status, required) =>
<div class="build-status-item"> <div class="build-status-item">
@@ -33,7 +32,6 @@
</div> </div>
} }
</div> </div>
</div>
} }
<div style="padding:15px"> <div style="padding:15px">
@if(status.hasConflict){ @if(status.hasConflict){

15
src/main/webapp/assets/common/css/gitbucket.css
View File

@@ -1139,22 +1139,21 @@ div.author-info div.committer {
font-size: 12px; font-size: 12px;
} }
.text-pending{ .text-pending {
color: #cea61b; color: #cea61b;
} }
.text-failure{ .text-failure {
color: #bd2c00; color: #bd2c00;
} }
.build-statuses{ .build-statuses {
margin: -10px -10px 10px -10px; padding: 10px 15px 10px 15px;
}
.build-statuses .build-status-item{
padding: 10px 15px 10px 64px;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
} }
.build-statuses-list .build-status-item{ .build-statuses-list .build-status-item {
background-color: #fafafa; background-color: #fafafa;
padding: 10px 15px 10px 15px;
border-bottom: 1px solid #eee;
} }
.merge-indicator{ .merge-indicator{