The Unified and Autonomous Development Platform
Css fix for pull request list
Robin Shen5f09036754bc
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.htmlindex 8f46f9660f..b1ee5c7ba0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="pull-request-jobs d-flex flex-column flex-wrap">+ <div class="pull-request-jobs d-flex flex-wrap align-items-start row-gap-3"><wicket:container wicket:id="jobs"><a wicket:id="job" class="d-flex align-items-center job"><svg wicket:id="status" class="status mr-2 flex-shrink-0"></svg>diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/pull-request-jobs.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/pull-request-jobs.cssindex 2a164e05dd..25f878c0e0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/pull-request-jobs.css+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/pull-request-jobs.css@@ -1,6 +1,3 @@-.pull-request-jobs>.job {- margin-bottom: 1rem;-}-.pull-request-jobs>.job:last-child {- margin-bottom: 0.5rem;+.pull-request-jobs {+ flex-direction: column;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.htmlindex 86d6f41ef7..e2845736b3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html@@ -45,9 +45,9 @@<wicket:svg href="comments" class="icon"></wicket:svg> <span wicket:id="comments"></span></div></div>- <div class="secondary d-flex flex-wrap">- <div class="status flex-shrink-0 mr-3 mb-2"><span wicket:id="status"></span></div>- <div class="review mr-3 mb-2" wicket:id="reviews"></div>+ <div class="secondary d-flex flex-wrap row-gap-3">+ <div class="status flex-shrink-0 mr-3"><span wicket:id="status"></span></div>+ <div class="review mr-3" wicket:id="reviews"></div><div class="jobs mr-3" wicket:id="jobs"></div><div class="last-update ml-auto d-none d-lg-block text-muted font-size-sm"><a wicket:id="user" class="link-gray"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span>diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.cssindex 5c53f2f6e1..26194fd634 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css@@ -8,5 +8,15 @@.pull-request-list>div>.body tr.request.new td.new-indicator {background: var(--primary);}--+.pull-request-list .pull-request-jobs {+ flex-direction: row;+}+.pull-request-list .pull-request-jobs>.job {+ margin-right: 1rem;+}+.pull-request-list .pull-request-jobs>.job:last-child {+ margin-right: 0;+}+.pull-request-list .request-status {+ width: 75px;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex ef612622f0..97eba68c6c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -184,7 +184,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRPullRequest request = getPullRequest();ReferenceTransformer transformer = new ReferenceTransformer(request.getTargetProject(), null);String transformed = Emojis.getInstance().apply(transformer.apply(request.getTitle()));- return "#" + request.getNumber() + " - " + transformed;+ return "#" + request.getNumber() + " " + transformed;}}) {