Skip to content

The Unified and Autonomous Development Platform

feat: Change the Style and Order of "update source branch" button.

sususweetf7b91dc52444
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
index c32913da6b..5da8392b1d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
@@ -103,16 +103,16 @@
</div>
</div>
<div wicket:id="requestOperations" class="operations">
- <a wicket:id="updateSourceBranch" type="button" class="btn btn-sm btn-danger dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Update Source Branch</a>
- <div class="dropdown-menu">
- <a wicket:id="updateSourceBranchMerge" class="dropdown-item">Merge</a>
- <a wicket:id="updateSourceBranchRebase" class="dropdown-item">Rebase</a>
- </div>
<a wicket:id="merge" class="btn btn-sm btn-light-success btn-hover-success">Merge</a>
<a wicket:id="discard" class="btn btn-sm btn-light-info btn-hover-info">Discard</a>
<a wicket:id="approve" class="btn btn-sm btn-light-success btn-hover-success">Approve</a>
<a wicket:id="requestForChanges" class="btn btn-sm btn-light-warning btn-hover-warning">Request For Changes</a>
<a wicket:id="reopen" class="btn btn-sm btn-light-primary btn-hover-primary">Reopen</a>
+ <a wicket:id="updateSourceBranch" type="button" class="btn btn-sm btn-light-primary btn-hover-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Update Source Branch</a>
+ <div class="dropdown-menu">
+ <a wicket:id="updateSourceBranchMerge" class="dropdown-item">Merge</a>
+ <a wicket:id="updateSourceBranchRebase" class="dropdown-item">Rebase</a>
+ </div>
<a wicket:id="deleteSourceBranch" class="btn btn-sm btn-light-primary btn-hover-primary">Delete Source Branch</a>
<a wicket:id="restoreSourceBranch" class="btn btn-sm btn-light-primary btn-hover-primary">Restore Source Branch</a>
</div>