Skip to content

The Unified and Autonomous Development Platform

style: Update pull request detail layout and styling

Robin Shenf41df81fe397
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 492375e701..6e7fe89bbb 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
@@ -32,7 +32,7 @@
</div>
<div wicket:id="content"></div>
</div>
- <div wicket:id="requestSummary" class="summary font-size-h6 border-top pt-4 mt-4">
+ <div wicket:id="requestSummary" class="summary font-size-h6 pt-4 mt-4 mx-n4 px-4">
<wicket:enclosure>
<div class="text-warning">
<wicket:svg href="exclamation-circle" class="icon"></wicket:svg> <span wicket:id="checkError"></span>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
index 41bafda3df..2c68564bd9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
@@ -1,3 +1,6 @@
+.pull-request-detail>.card-body>.main>.sticky-tabs-row {
+ margin-bottom: 0 !important;
+}
.pull-request-detail>.card-body>.main>.activities>.activity {
border-left: 4px solid white;
}
@@ -15,8 +18,7 @@
border-top-color: var(--dark-mode-light-dark);
}
.pull-request-detail>.card-body>.main>.activities>.activity:first-child {
- border-top-width: 2px;
- border-top-style: dashed;
+ border-top: none;
}
.pull-request-detail>.card-body>.main>.activities>.activity>div {
padding: 16px 0 16px 8px;
@@ -95,4 +97,4 @@
.pull-request-detail>.card-body>.main>.activities>.activity>.commit+.commit,
.pull-request-detail>.card-body>.main>.activities>.PullRequestUpdateActivity+.PullRequestUpdateActivity.activity>.commit {
margin-top: -16px;
-}
\ No newline at end of file
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
index 14bae93a31..1c35ca9100 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
@@ -7,6 +7,9 @@
.pull-request-detail>.card-body>.main>.primary>.description {
margin-bottom: 0 !important;
}
+.pull-request-detail>.card-body>.main>.primary>.summary {
+ border-top: 1px dashed var(--primary);
+}
.pull-request-detail>.card-body>.main>.primary>.summary>div {
margin-bottom: 1rem;
}