The Unified and Autonomous Development Platform
Minor UI tweaks
Robin Shen6d96f1a7a53d
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex c41c250305..e09ba01d0b 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -436,7 +436,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestString reason;if (dueToMerged)- reason = "closed pull request as source branch is merged into target branch";+ reason = "merged pull request";elsereason = null;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 86313339fb..6207c1741a 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,10 +1,10 @@<wicket:panel><div class="pull-request-jobs d-flex align-items-center"><wicket:container wicket:id="jobs">- <a wicket:id="job" class="job">- <svg wicket:id="status" class="status mr-1"></svg>- <span wicket:id="name" class="name mr-1"></span>- <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg>+ <a wicket:id="job" class="d-flex align-items-center job flex-nowrap">+ <svg wicket:id="status" class="status mr-2 flex-shrink-0"></svg>+ <span wicket:id="name" class="name mr-1 text-truncate"></span>+ <wicket:svg href="arrow" class="icon rotate-90 flex-shrink-0"></wicket:svg></a></wicket:container></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.htmlindex a9b933821e..d844f399bf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html@@ -25,7 +25,7 @@</div><div wicket:id="body" class="body flex-grow-1 d-flex flex-column"><div wicket:id="feedback" class="feedback flex-shrink-0"></div>- <div class="columns flex-grow-1 d-flex mt-5 autofit overflow-auto pb-5">+ <div class="columns flex-grow-1 d-flex mt-5 autofit overflow-auto"><div wicket:id="columns" class="column d-flex flex-column overflow-hidden"></div></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex 21817e7359..6181e0c993 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -263,7 +263,6 @@ public class IssueBoardsPage extends ProjectIssuesPage {if (getBoard() != null) {contentFrag = new Fragment("content", "hasBoardsFrag", this);- contentFrag.add(AttributeAppender.append("class", "mb-n5"));Form<?> form = new Form<Void>("query");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.htmlindex 96301b929d..0de96f4378 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@@ -22,8 +22,8 @@<div wicket:id="status" class="badge status mr-3 font-size-h6"></div><div class="branches font-size-lg mr-3 d-flex align-items-center"><div class="text-muted">- <a wicket:id="user" class="link-gray"></a> wants to merge into <a wicket:id="target" class="branch link-primary"></a>- from <a wicket:id="source" class="branch link-primary"></a> <span wicket:id="date"></span>+ <a wicket:id="user" class="link-gray"></a> wants to merge into <a wicket:id="target" class="branch link-gray"></a>+ from <a wicket:id="source" class="branch link-gray"></a> <span wicket:id="date"></span></div></div><a wicket:id="newPullRequest" class="btn btn-primary btn-icon flex-shrink-0 ml-auto" title="Open new pull request"><wicket:svg href="plus" class="icon"/></a>@@ -44,7 +44,7 @@<wicket:svg href="tick-circle" class="icon"></wicket:svg> Commits were merged into target branch</div><div wicket:id="mergedOutside" class="merged-outside text-success">- <wicket:svg href="tick-circle" class="icon"></wicket:svg> Commits were merged into target branch by someone outside of this pull request+ <wicket:svg href="tick-circle" class="icon"></wicket:svg> Commits were merged into target branch outside of this pull request</div><div wicket:id="squashed" class="squashed text-success"><wicket:svg href="tick-circle" class="icon"></wicket:svg> Commits were squashed into a single commit on target branchdiff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.htmlindex c3df4a15bf..fd30495a56 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="head"><span wicket:id="user" class="user"></span> <span wicket:id="description"></span> <span wicket:id="age"></span>- <a wicket:id="changes" class="changes" title="Changes since this action"><wicket:svg href="diff" class="icon"></wicket:svg></a>+ <a wicket:id="changes" class="changes btn btn-icon btn-xs btn-light btn-hover-primary" title="Changes since this action"><wicket:svg href="diff" class="icon"></wicket:svg></a></div><div wicket:id="body" class="body"></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.htmlindex cabc95313f..7870db8feb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="head"><span wicket:id="user" class="user"></span> commented <span wicket:id="age"></span>- <a wicket:id="changes" title="Changes since this comment" class="changes"><wicket:svg href="diff" class="icon"></wicket:svg></a>+ <a wicket:id="changes" title="Changes since this comment" class="btn btn-xs btn-icon btn-light btn-hover-primary changes"><wicket:svg href="diff" class="icon"></wicket:svg></a></div><div wicket:id="body" class="body"></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.htmlindex 1a382870f2..b00a3e5e31 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.html@@ -16,23 +16,23 @@</div><wicket:fragment wicket:id="commitsFrag"><div class="commits-selector noselect p-4">- <div class="head">- <h6 class="mb-4">Click to select a commit, or shift-click to select multiple commits</h6>- <div class="links mb-4">- <a wicket:id="allChanges" class="btn btn-light btn-sm mr-2">All changes</a>- <a wicket:id="changesSinceLastReview" class="btn btn-light btn-sm mr-2">Changes since last review</a>- <a class="btn btn-light btn-sm selected-changes disabled">Show selected changes</a>- </div>+ <div class="links mb-3">+ <a wicket:id="allChanges" class="btn btn-light btn-sm mr-2">All changes</a>+ <a wicket:id="changesSinceLastReview" class="btn btn-light btn-sm mr-2">Changes since last review</a>+ <a class="btn btn-light btn-sm selected-changes disabled">Show selected changes</a></div>- <ul class="body list-unstyled autosuit mb-0">+ <ul class="list-unstyled autosuit mb-0"><li wicket:id="commits">- <a unselectable="on">- <wicket:svg href="commit" class="icon" unselectable="on"></wicket:svg>- <span wicket:id="hash" class="hash" unselectable="on"></span>+ <a unselectable="on" class="d-flex align-items-center">+ <wicket:svg href="commit" class="icon mr-2" unselectable="on"></wicket:svg>+ <span wicket:id="hash" class="hash mr-2" unselectable="on"></span><span wicket:id="subject" class="subject" unselectable="on"></span></a></li></ul>+ <div class="mt-3 text-muted d-flex align-items-center">+ <wicket:svg href="bulb" class="icon mr-2"/> Click to select a commit, or shift-click to select multiple commit+ </div></div></wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.javaindex 9ecdc092de..b675629bb7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java@@ -60,6 +60,7 @@ import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.diff.revision.CommentSupport;import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;+import io.onedev.server.web.component.floating.AlignPlacement;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;@@ -329,7 +330,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Com});- DropdownLink selectedCommitsLink = new DropdownLink("comparingCommits") {+ DropdownLink selectedCommitsLink = new DropdownLink("comparingCommits", new AlignPlacement(50, 100, 50, 0)) {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.cssindex 52306bf0e2..61156a9216 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css@@ -4,6 +4,7 @@padding: 0.5rem 1rem;white-space: nowrap;font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;+ color: var(--gray-dark);}.commits-selector ul a:hover {background: var(--light);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.js b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.jsindex e2ec8da187..58b016ad3d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.js@@ -8,7 +8,7 @@ onedev.server.requestChanges = {var toIndexToApply = toIndex;function onIndexChanged() {- var $apply = $(".commits-selector>.head a.selected-changes");+ var $apply = $(".commits-selector>.links a.selected-changes");if (fromIndexToApply != fromIndex || toIndexToApply != toIndex) {$apply.removeClass("disabled").off("click").click(function() {var oldCommit;