The Unified and Autonomous Development Platform
More css tunes for mobile experiences
Robin Shend0143d089615
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.javaindex b178225f30..8a63554148 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java@@ -60,6 +60,7 @@ import io.onedev.server.event.build.BuildEvent;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.pullrequest.PullRequestBuildEvent;import io.onedev.server.event.pullrequest.PullRequestChangeEvent;+import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent;import io.onedev.server.event.pullrequest.PullRequestDeleted;import io.onedev.server.event.pullrequest.PullRequestEvent;import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;@@ -629,6 +630,12 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestevent.getRequest().setUpdateDate(event.getDate());}+ @Transactional+ @Listen+ public void on(PullRequestCodeCommentEvent event) {+ event.getRequest().setLastCodeCommentActivityDate(event.getDate());+ }+@Listen@Transactionalpublic void on(BuildEvent event) {diff --git a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.htmlindex 3a5fe1b477..6a7957233f 100644--- a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html@@ -12,7 +12,6 @@<div wicket:id="others" class="others clearfix"><a wicket:id="showSavedQueries" class="show-saved-queries pull-left"><i class="fa fa-eye"></i> Show Saved Queries</a><a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a>- <div wicket:id="pageInfo" class="page-info pull-right"></div></div></div><div class="body">diff --git a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 4d85038afa..44c3fc05af 100644--- a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -14,9 +14,7 @@ import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.event.IEvent;import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigatorLabel;import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;@@ -90,8 +88,6 @@ public abstract class BuildListPanel extends GenericPanel<String> {};- private DataTable<Build, Void> buildsTable;-private SortableDataProvider<Build, Void> dataProvider;public BuildListPanel(String id, IModel<String> queryModel) {@@ -331,19 +327,9 @@ public abstract class BuildListPanel extends GenericPanel<String> {}});- add(buildsTable = new HistoryAwareDataTable<Build, Void>("builds", columns, dataProvider,+ add(new HistoryAwareDataTable<Build, Void>("builds", columns, dataProvider,WebConstants.PAGE_SIZE, getPagingHistorySupport()));- others.add(new NavigatorLabel("pageInfo", buildsTable) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(buildsTable.getItemCount() != 0);- }-- });-setOutputMarkupId(true);}diff --git a/core/src/main/java/io/onedev/server/web/component/build/list/build-list.css b/core/src/main/java/io/onedev/server/web/component/build/list/build-list.cssindex c27285d79d..974cb2b2b9 100644--- a/core/src/main/java/io/onedev/server/web/component/build/list/build-list.css+++ b/core/src/main/java/io/onedev/server/web/component/build/list/build-list.css@@ -8,3 +8,6 @@margin-right: 16px;color: #666;}+.build-list>.head>.others>*:last-child {+ margin-right: 0;+}diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.htmlindex fbf48b8b97..3ccc973793 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html@@ -12,7 +12,6 @@<div wicket:id="others" class="others clearfix"><a wicket:id="showSavedQueries" class="show-saved-queries pull-left"><i class="fa fa-eye"></i> Show Saved Queries</a><a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a>- <div wicket:id="pageInfo" class="page-info pull-right"></div></div></div><div class="body">diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex 94cce16854..e2ae1c6433 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -15,9 +15,7 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.event.IEvent;import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigatorLabel;import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;@@ -87,8 +85,6 @@ public abstract class CodeCommentListPanel extends GenericPanel<String> {};- private DataTable<CodeComment, Void> commentsTable;-public CodeCommentListPanel(String id, IModel<String> queryModel) {super(id, queryModel);}@@ -320,9 +316,14 @@ public abstract class CodeCommentListPanel extends GenericPanel<String> {cellItem.add(new Label(componentId, DateUtils.formatAge(comment.getUpdateDate())));}+ @Override+ public String getCssClass() {+ return "expanded";+ }+});- add(commentsTable = new HistoryAwareDataTable<CodeComment, Void>("comments", columns, dataProvider,+ add(new HistoryAwareDataTable<CodeComment, Void>("comments", columns, dataProvider,WebConstants.PAGE_SIZE, getPagingHistorySupport()) {@Override@@ -335,15 +336,6 @@ public abstract class CodeCommentListPanel extends GenericPanel<String> {}});- others.add(new NavigatorLabel("pageInfo", commentsTable) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(commentsTable.getItemCount() != 0);- }-- });}@Overridediff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css b/core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.cssindex 00cc5c6d23..dd8d10d279 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css@@ -5,6 +5,9 @@margin-right: 16px;color: #666;}+.code-comments>.head>.others>*:last-child {+ margin-right: 0;+}.code-comments .new-indicator {width: 4px;padding: 0;@@ -107,4 +110,10 @@font-weight: bold;color: #444;margin-bottom: 20px;-}\ No newline at end of file+}++@media(max-width: 767px) {+ .code-comments th.expanded, .code-comments td.expanded {+ display: none;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.htmlindex def563c939..17b522c234 100644--- a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html@@ -9,7 +9,7 @@</div></div><wicket:fragment wicket:id="commitFrag">- <div class="avatar pull-left">+ <div class="avatar"><span wicket:id="avatar"></span></div><div class="detail pull-left">@@ -19,9 +19,9 @@</div><div wicket:id="contribution"></div></div>- <div class="pull-right">+ <div class="pull-right actions"><span wicket:id="buildStatus" class="build-status"></span>- <span class="btn-group">+ <span class="btn-group hash"><a wicket:id="hashLink" class="hash btn btn-default"><span wicket:id="hash"></span></a><a wicket:id="copyHash" class="btn btn-default"><i class="fa fa-clipboard"></i></a></span>diff --git a/core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css b/core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.cssindex d2107388f3..1feaaa55cc 100644--- a/core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css+++ b/core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css@@ -3,9 +3,11 @@}.commit-list>div>ul li {padding: 4px 0;+ position: relative;}.commit-list>div>ul .commit>.avatar {margin-top: 4px;+ position: absolute;}.commit-list>div>ul .label {margin: 3px 0 0 4px;@@ -21,7 +23,7 @@font-size: 15px;}.commit-list>div>ul .commit>.detail {- padding-left: 8px;+ padding-left: 48px;padding-right: 8px;}.commit-list>div>ul .commit:hover, .commit-list>div>ul .commit.hover {@@ -45,9 +47,11 @@.commit-list .alert {margin-bottom: 12px;}-.commit-list .pull-right {- margin-top: 6px;+.commit-list .actions {+ margin: 6px 0 0 8px;+}+@media(max-width: 767px) {+ .commit-list li.commit>.actions {+ display: none;+ }}-.commit-list .build-status {- margin-right: 4px;-}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.htmlindex 5f0000c284..bdbae30318 100644--- a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="revision-diff"><div wicket:id="revisionsIndexing" class="revisions-indexing">- <img wicket:id="icon"></img>+ <img wicket:id="icon"><span>Revisions indexing in progress... (symbol navigation in revisions will be accurate after indexed)</span></div><table class="head">@@ -18,7 +18,7 @@<td class="path-filter"><form wicket:id="pathFilter"><div class="input-group">- <input wicket:id="input" class="form-control no-autofocus" spellcheck="false" autocomplete="off" placeholder="Filter by path" type="text"></input>+ <input wicket:id="input" class="form-control no-autofocus" spellcheck="false" autocomplete="off" placeholder="Filter by path" type="text"><span class="input-group-btn"><button wicket:id="submit" title="Filter" class="btn btn-default" type="submit"><i class="fa fa-search"></i></button></span>diff --git a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex 2c3d3094e8..9eaeacc6e3 100644--- a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -987,6 +987,15 @@ public class RevisionDiffPanel extends Panel {});+ add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return "diff-mode-" + diffMode.name().toLowerCase();+ }++ }));+setOutputMarkupId(true);}diff --git a/core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css b/core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.cssindex c97ff25e4b..48a6433e7d 100644--- a/core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css+++ b/core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css@@ -1,3 +1,16 @@+.revision-diff {+ min-width: 600px;+}+.revision-diff.additionalWidth1 {+ min-width: 900px;+}+.revision-diff.additionalWidth2 {+ min-width: 1200px;+}+.revision-diff.additionalWidth3 {+ min-width: 1500px;+}+.revision-diff>.revisions-indexing {padding: 8px 8px 9px 8px;background: #fcf8e3;diff --git a/core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js b/core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.jsindex 488418243f..8a3b4f620b 100644--- a/core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js+++ b/core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js@@ -54,6 +54,18 @@ onedev.server.revisionDiff = {return;}+ var additionalWidth = 0;+ if ($(".revision-diff>.body>.detail>.comment").length != 0)+ additionalWidth++;+ if ($(".revision-diff>.body>.detail td.blame").length != 0)+ additionalWidth++;+ if ($(".diff-mode-split>.revision-diff").length != 0)+ additionalWidth++;++ $(".revision-diff").removeClass("additionalWidth1")+ .removeClass("additionalWidth2").removeClass("additionalWidth3")+ .addClass("additionalWidth" + additionalWidth);+var $detail = $(".revision-diff>.body>.detail");var $comment = $detail.children(".comment");var $diffs = $detail.children(".diffs");@@ -65,7 +77,7 @@ onedev.server.revisionDiff = {var scrollTop = $(window).scrollTop();$comment.css("left", $detail.offset().left - scrollLeft);var topOffset = $diffs.offset().top - scrollTop;- var headHeight = $("#layout>.head").outerHeight();+ var headHeight = $("#layout>.navbar").outerHeight();if (topOffset <= headHeight) {$comment.css("top", headHeight);} else {diff --git a/core/src/main/java/io/onedev/server/web/component/entity/nav/entity-nav.css b/core/src/main/java/io/onedev/server/web/component/entity/nav/entity-nav.cssindex 24fe8a8a69..b793a784c7 100644--- a/core/src/main/java/io/onedev/server/web/component/entity/nav/entity-nav.css+++ b/core/src/main/java/io/onedev/server/web/component/entity/nav/entity-nav.css@@ -8,10 +8,6 @@color: #666;top: 0;}-.entity-nav a[disabled] {- color: #BBB;- cursor: default;-}.entity-nav .prev {left: 0;}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css b/core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.cssindex 40beadf95f..14d4b2affd 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css@@ -17,16 +17,16 @@border-bottom: none;}.issue-activities>table>tbody>tr>td.avatar {- width: 40px;+ width: 1px;border-left: 4px solid white;- padding-left: 12px;+ padding-left: 8px;}.issue-activities>table>tbody>tr>td.avatar .avatar {width: 40px;height: 40px;}.issue-activities>table>tbody>tr>td.content {- padding-left: 20px;+ padding-left: 16px;}.issue-activities .activity>.content>.head {color: #888;@@ -72,3 +72,16 @@background: #F9F9F9;border-radius: 4px;}+@media(max-width: 767px) {+ .issue-activities>table>tbody>tr>td.avatar .avatar {+ width: 24px;+ height: 24px;+ }+ .issue-activities>table>tbody>tr>td.content {+ padding-left: 6px;+ }+ .issue-activities .activity>.content>.body {+ margin-top: 12px;+ margin-left: -24px;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.htmlindex c0b69a661b..ae133e99d5 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html@@ -9,14 +9,13 @@</span></div></form>- <a wicket:id="newIssue" class="open-new btn btn-success"><i class="fa fa-plus"></i> New Issue</a>+ <a wicket:id="newIssue" class="open-new btn btn-success"><i class="fa fa-plus"></i> Create</a><div wicket:id="others" class="others clearfix"><a wicket:id="showSavedQueries" class="show-saved-queries pull-left"><i class="fa fa-eye"></i> Show Saved Queries</a><a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a><a wicket:id="batchEditSelected" class="pull-left"><i class="fa fa-pencil"></i> Batch Edit Selected</a><a wicket:id="batchEditAll" class="pull-left"><i class="fa fa-pencil"></i> Batch Edit All</a><a wicket:id="listFields" class="list-fields pull-left"><i class="fa fa-list-ul"></i> Display Fields</a>- <div wicket:id="pageInfo" class="page-info pull-right"></div></div></div><div class="body">diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex 0911ee62bf..6439a9feef 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -20,7 +20,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulatoimport org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigatorLabel;import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;@@ -578,16 +577,6 @@ public abstract class IssueListPanel extends GenericPanel<String> {}});- others.add(new NavigatorLabel("pageInfo", issuesTable) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(issuesTable.getItemCount() != 0);- }-- });-setOutputMarkupId(true);}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css b/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.cssindex b0dfcaeb3b..ba8a1bc300 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css@@ -1,3 +1,11 @@+@media(max-width: 767px) {+ .issue-list a.list-fields,+ .issue-list th.custom-field,+ .issue-list td.custom-field {+ display: none;+ }+}+.issue-list>.head {position: relative;}@@ -5,7 +13,7 @@margin-bottom: 20px;}.issue-list>.head>form {- margin-right: 124px;+ margin-right: 100px;}.issue-list>.head>.open-new {position: absolute;@@ -16,6 +24,9 @@margin-right: 16px;color: #666;}+.issue-list>.head>.others>*:last-child {+ margin-right: 0;+}.issue-list>.body td.submitter,.issue-list>.body th.custom-field,.issue-list>.body td.custom-field {diff --git a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.htmlindex 0c6be9997d..42b334b258 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html@@ -1,14 +1,10 @@<wicket:panel><div class="issue-operations"><div class="state-and-actions clearfix">- <span wicket:id="state" class="pull-left"></span>- <div class="transition-actions pull-left">- <wicket:enclosure child="transitions">- <span class="btn-group">- <a wicket:id="transitions" class="btn btn-default btn-sm"><span wicket:id="label"></span></a>- </span>- </wicket:enclosure>- </div>+ <div wicket:id="state" class="pull-left"></div>+ <wicket:enclosure child="transitions">+ <a wicket:id="transitions" class="btn btn-default btn-sm pull-left"><span wicket:id="label"></span></a>+ </wicket:enclosure><a wicket:id="newIssue" class="new-issue pull-left btn btn-success btn-sm"><i class="fa fa-plus"></i> New Issue</a></div><div wicket:id="actionOptions" class="action-options"></div>@@ -26,7 +22,7 @@<wicket:fragment wicket:id="titleEditFrag"><div wicket:id="feedback"></div><form wicket:id="form" class="form-inline clearable-wrapper">- <input wicket:id="title" type="text" placeholder="Input title" class="form-control"></input>+ <input wicket:id="title" type="text" placeholder="Input title" class="form-control"><input wicket:id="save" type="submit" value="Save" class="btn btn-primary"/><input wicket:id="cancel" type="button" value="Cancel" class="btn btn-default"/></form>diff --git a/core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css b/core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.cssindex 6dd177460b..eb23fe42d1 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css+++ b/core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css@@ -1,9 +1,13 @@.issue-operations>div {margin-bottom: 20px;}+.issue-operations>.state-and-actions {+ margin-bottom: 12px;+}.issue-operations>.state-and-actions>.issue-state {font-size: 20px;}.issue-operations>.state-and-actions>* {- margin-right: 20px;+ margin-right: 10px;+ margin-bottom: 8px;}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsCssResourceReference.javanew file mode 100644index 0000000000..9e079a3383--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.issue.pullrequests;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class IssuePullRequestsCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public IssuePullRequestsCssResourceReference() {+ super(IssuePullRequestsCssResourceReference.class, "issue-pull-requests.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.htmlindex 8ac2e7f2eb..74db98eb19 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.html@@ -1,5 +1,5 @@<wicket:panel>- <table wicket:id="requests" class="table"></table>+ <table wicket:id="requests" class="table issue-pull-requests"></table><wicket:fragment wicket:id="titleFrag"><a wicket:id="link"><span wicket:id="label"></span></a></wicket:fragment>diff --git a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.javaindex c958ca755a..d4720ceb34 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java@@ -15,6 +15,8 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;@@ -134,6 +136,11 @@ public abstract class IssuePullRequestsPanel extends Panel {}}+ @Override+ public String getCssClass() {+ return "expanded";+ }+});SortableDataProvider<PullRequest, Void> dataProvider = new LoadableDetachableDataProvider<PullRequest, Void>() {@@ -169,5 +176,11 @@ public abstract class IssuePullRequestsPanel extends Panel {}protected abstract Issue getIssue();++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new IssuePullRequestsCssResourceReference()));+ }}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/issue-pull-requests.css b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/issue-pull-requests.cssnew file mode 100644index 0000000000..fa47408042--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/issue-pull-requests.css@@ -0,0 +1,5 @@+@media(max-width: 767px) {+ .issue-pull-requests th.expanded, .issue-pull-requests td.expanded {+ display: none;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.html b/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.htmlindex 18cd324596..052e21cc46 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.html+++ b/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.html@@ -1,11 +1,15 @@<wicket:panel><div wicket:id="content" class="issue-title"></div><wicket:fragment wicket:id="titleEditFrag">- <form wicket:id="form" class="form-inline clearable-wrapper">+ <form wicket:id="form"><div wicket:id="feedback"></div>- <input wicket:id="title" type="text" placeholder="Input title" class="form-control"></input>- <input wicket:id="save" type="submit" value="Save" class="btn btn-primary"/>- <input wicket:id="cancel" type="button" value="Cancel" class="btn btn-default"/>+ <div class="clearable-wrapper">+ <input wicket:id="title" type="text" placeholder="Input title" class="form-control">+ </div>+ <div class="actions">+ <input wicket:id="save" type="submit" value="Save" class="btn btn-primary"/>+ <input wicket:id="cancel" type="button" value="Cancel" class="btn btn-default"/>+ </div></form></wicket:fragment><wicket:fragment wicket:id="titleViewFrag">diff --git a/core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.css b/core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.cssindex e1d41272b7..ea0fac0c5a 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.css+++ b/core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.css@@ -9,13 +9,8 @@margin-left: 8px;}.issue-title input[type=text] {- width: 600px;font-weight: normal;}-.issue-title .input-clear {- right: auto;- left: 573px;-}.issue-title .alert {font-weight: normal;font-size: 14px;diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/markdown.css b/core/src/main/java/io/onedev/server/web/component/markdown/markdown.cssindex be833e84c7..582a267bcf 100644--- a/core/src/main/java/io/onedev/server/web/component/markdown/markdown.css+++ b/core/src/main/java/io/onedev/server/web/component/markdown/markdown.css@@ -1,5 +1,13 @@-.markdown-editor.compact-mode .normal-mode, .markdown-editor.normal-mode .compact-mode {- display: none;+@media(max-width: 767px) {+ .markdown-editor .normal-mode {+ display: none;+ }+}+@media(min-width: 768px) {+ .markdown-editor.compact-mode .normal-mode,+ .markdown-editor.normal-mode .compact-mode {+ display: none;+ }}body.fullscreen {overflow: hidden;diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/core/src/main/java/io/onedev/server/web/component/markdown/markdown.jsindex 39bcd97be5..85f7cb849d 100644--- a/core/src/main/java/io/onedev/server/web/component/markdown/markdown.js+++ b/core/src/main/java/io/onedev/server/web/component/markdown/markdown.js@@ -65,7 +65,6 @@ onedev.server.markdown = {$previewLink.removeClass("active");$splitLink.removeClass("active");onLayoutChange();- console.log(onedev.server.markdown.getCookiePrefix($container)+".split");Cookies.set(onedev.server.markdown.getCookiePrefix($container)+".split", false, {expires: Infinity});});$previewLink.click(function() {diff --git a/core/src/main/java/io/onedev/server/web/component/menu/MenuCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/menu/MenuCssResourceReference.javanew file mode 100644index 0000000000..17977fcc2d--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/menu/MenuCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.menu;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class MenuCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public MenuCssResourceReference() {+ super(MenuCssResourceReference.class, "menu.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/menu/MenuLink.java b/core/src/main/java/io/onedev/server/web/component/menu/MenuLink.javaindex 4f04e8c16a..cf1eaa68dc 100644--- a/core/src/main/java/io/onedev/server/web/component/menu/MenuLink.java+++ b/core/src/main/java/io/onedev/server/web/component/menu/MenuLink.java@@ -51,7 +51,7 @@ public abstract class MenuLink extends DropdownLink {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new MenuResourceReference()));+ response.render(CssHeaderItem.forReference(new MenuCssResourceReference()));}protected abstract List<MenuItem> getMenuItems(FloatingPanel dropdown);diff --git a/core/src/main/java/io/onedev/server/web/component/menu/MenuResourceReference.java b/core/src/main/java/io/onedev/server/web/component/menu/MenuResourceReference.javadeleted file mode 100644index 437beb5756..0000000000--- a/core/src/main/java/io/onedev/server/web/component/menu/MenuResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.component.menu;--import org.apache.wicket.request.resource.CssResourceReference;--public class MenuResourceReference extends CssResourceReference {-- private static final long serialVersionUID = 1L;-- public MenuResourceReference() {- super(MenuResourceReference.class, "menu.css");- }--}diff --git a/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex a204f908c6..04510404c6 100644--- a/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -6,7 +6,6 @@ import java.util.List;import javax.annotation.Nullable;-import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;@@ -33,6 +32,7 @@ import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.util.DateUtils;import io.onedev.server.util.facade.ProjectFacade;+import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.WebConstants;import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;@@ -41,7 +41,6 @@ import io.onedev.server.web.component.project.avatar.ProjectAvatar;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.util.PagingHistorySupport;-import io.onedev.server.util.userident.UserIdent;@SuppressWarnings("serial")public class ProjectListPanel extends Panel {@@ -75,8 +74,13 @@ public class ProjectListPanel extends Panel {link.add(new Label("name", project.getName()));fragment.add(link);cellItem.add(fragment);- cellItem.add(AttributeAppender.append("class", "project"));}++ @Override+ public String getCssClass() {+ return "project";+ }+});columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Last Author")) {@@ -92,8 +96,13 @@ public class ProjectListPanel extends Panel {} else {cellItem.add(new Label(componentId, "<i>N/A</i>").setEscapeModelStrings(false));}- cellItem.add(AttributeAppender.append("class", "author"));}++ @Override+ public String getCssClass() {+ return "author expanded";+ }+});columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Last Commit Message")) {@@ -113,8 +122,13 @@ public class ProjectListPanel extends Panel {} else {cellItem.add(new Label(componentId, "<i>N/A</i>").setEscapeModelStrings(false));}- cellItem.add(AttributeAppender.append("class", "commit-message"));}++ @Override+ public String getCssClass() {+ return "commit-message";+ }+});columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Last Commit Date")) {@@ -129,8 +143,13 @@ public class ProjectListPanel extends Panel {} else {cellItem.add(new Label(componentId, "<i>N/A</i>").setEscapeModelStrings(false));}- cellItem.add(AttributeAppender.append("class", "commit-date"));}++ @Override+ public String getCssClass() {+ return "commit-date expanded";+ }+});SortableDataProvider<ProjectFacade, Void> dataProvider = new LoadableDetachableDataProvider<ProjectFacade, Void>() {diff --git a/core/src/main/java/io/onedev/server/web/component/project/list/project-list.css b/core/src/main/java/io/onedev/server/web/component/project/list/project-list.cssindex d294b2dc25..575540f817 100644--- a/core/src/main/java/io/onedev/server/web/component/project/list/project-list.css+++ b/core/src/main/java/io/onedev/server/web/component/project/list/project-list.css@@ -1,3 +1,9 @@+@media(max-width: 767px) {+ table.project-list th.expanded, table.project-list td.expanded {+ display: none;+ }+}+table.project-list {font-size: 13px;}@@ -11,3 +17,4 @@ table.project-list td.project, table.project-list td.author {table.project-list td.commit-date {color: #888;}+diff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/ActionTab.java b/core/src/main/java/io/onedev/server/web/component/tabbable/ActionTab.javaindex 76bd29ed0a..5968f86fe4 100644--- a/core/src/main/java/io/onedev/server/web/component/tabbable/ActionTab.java+++ b/core/src/main/java/io/onedev/server/web/component/tabbable/ActionTab.java@@ -45,5 +45,10 @@ public abstract class ActionTab extends Tab {onSelect(tabLink);}+ @Override+ public String getTitle() {+ return titleModel.getObject();+ }+protected abstract void onSelect(Component tabLink);}diff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/AjaxActionTab.java b/core/src/main/java/io/onedev/server/web/component/tabbable/AjaxActionTab.javaindex 1a34220924..ad3447e8fb 100644--- a/core/src/main/java/io/onedev/server/web/component/tabbable/AjaxActionTab.java+++ b/core/src/main/java/io/onedev/server/web/component/tabbable/AjaxActionTab.java@@ -49,7 +49,13 @@ public abstract class AjaxActionTab extends ActionTab {@Overrideprotected final void onSelect(Component tabLink) {AjaxRequestTarget target = Preconditions.checkNotNull(RequestCycle.get().find(AjaxRequestTarget.class));- target.add(Preconditions.checkNotNull(tabLink.findParent(Tabbable.class)));+ Tabbable tabbable = tabLink.findParent(Tabbable.class);+ if (tabbable == null) {+ Tabbable.TabsFragment tabs = Preconditions.checkNotNull(tabLink.findParent(Tabbable.TabsFragment.class));+ tabs.getDropdown().close();+ tabbable = tabs.getTabbable();+ }+ target.add(tabbable);onSelect(target, tabLink);}diff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/PageTab.java b/core/src/main/java/io/onedev/server/web/component/tabbable/PageTab.javaindex 50f9fa1f12..6882fbe46d 100644--- a/core/src/main/java/io/onedev/server/web/component/tabbable/PageTab.java+++ b/core/src/main/java/io/onedev/server/web/component/tabbable/PageTab.java@@ -153,4 +153,9 @@ public class PageTab extends Tab {return false;}+ @Override+ public String getTitle() {+ return titleModel.getObject();+ }+}diff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/Tab.java b/core/src/main/java/io/onedev/server/web/component/tabbable/Tab.javaindex 6abd054b18..deb9124aa0 100644--- a/core/src/main/java/io/onedev/server/web/component/tabbable/Tab.java+++ b/core/src/main/java/io/onedev/server/web/component/tabbable/Tab.java@@ -17,4 +17,6 @@ public abstract class Tab implements Serializable {}public abstract boolean isSelected();++ public abstract String getTitle();}diff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.html b/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.htmlindex ed9f0e6fb8..bdcb607afc 100644--- a/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.html+++ b/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.html@@ -1,6 +1,22 @@<wicket:panel>- <li wicket:id="tabs">+ <li wicket:id="tabs" class="expanded"><wicket:container wicket:id="tab"></wicket:container></li>+ <li class="collapsed active">+ <wicket:container wicket:id="collapsed"></wicket:container>+ </li><li wicket:id="options" class="options"></li>+ <wicket:fragment wicket:id="multiTabCollapsedFrag">+ <a wicket:id="link" class="multiple"><span wicket:id="label"></span> <i class="fa fa-angle-down"></i></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="singleTabCollapsedFrag">+ <a class="single"><span wicket:id="label"></span></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="tabsFrag">+ <ul class="list-unstyled">+ <li wicket:id="tabs">+ <wicket:container wicket:id="tab"></wicket:container>+ </li>+ </ul>+ </wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.java b/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.javaindex b69f092d93..23267af2b6 100644--- a/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.java+++ b/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.java@@ -5,13 +5,21 @@ import java.util.List;import org.apache.wicket.AttributeModifier;import org.apache.wicket.Component;+import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.MarkupStream;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;+@SuppressWarnings("serial")public class Tabbable extends Panel {@@ -67,6 +75,45 @@ public class Tabbable extends Panel {});+ if (tabs.size() > 1) {+ Fragment fragment = new Fragment("collapsed", "multiTabCollapsedFrag", this);+ fragment.add(new DropdownLink("link") {++ @Override+ protected void onInitialize(FloatingPanel dropdown) {+ super.onInitialize(dropdown);+ dropdown.add(AttributeAppender.append("class", "menu tabs"));+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ return new TabsFragment(id, dropdown);+ }++ @Override+ protected void onBeforeRender() {+ boolean found = false;+ for (Tab tab: tabs) {+ if (tab.isSelected()) {+ addOrReplace(new Label("label", tab.getTitle()));+ found = true;+ break;+ }+ }+ if (!found)+ addOrReplace(new Label("label", "Please select..."));++ super.onBeforeRender();+ }++ });+ add(fragment);+ } else {+ Fragment fragment = new Fragment("collapsed", "singleTabCollapsedFrag", this);+ fragment.add(new Label("label", tabs.iterator().next().getTitle()));+ add(fragment);+ }+setOutputMarkupId(true);}@@ -89,4 +136,46 @@ public class Tabbable extends Panel {super.onBeforeRender();}+ public class TabsFragment extends Fragment {++ private final FloatingPanel dropdown;++ public TabsFragment(String id, FloatingPanel dropdown) {+ super(id, "tabsFrag", Tabbable.this);+ this.dropdown = dropdown;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new ListView<Tab>("tabs", tabs){++ @Override+ protected void populateItem(ListItem<Tab> item) {+ Tab tab = item.getModelObject();+ if (tab.isSelected())+ item.add(AttributeModifier.append("class", "active"));++ item.add(tab.render("tab"));+ }++ });+ }++ public Tabbable getTabbable() {+ return Tabbable.this;+ }++ public FloatingPanel getDropdown() {+ return dropdown;+ }++ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new TabbableCssResourceReference()));+ }+}diff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/TabbableCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/tabbable/TabbableCssResourceReference.javanew file mode 100644index 0000000000..ad7129ca0b--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/tabbable/TabbableCssResourceReference.java@@ -0,0 +1,26 @@+package io.onedev.server.web.component.tabbable;++import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;++import io.onedev.server.web.component.menu.MenuCssResourceReference;+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class TabbableCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public TabbableCssResourceReference() {+ super(TabbableCssResourceReference.class, "tabbable.css");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(CssHeaderItem.forReference(new MenuCssResourceReference()));+ return dependencies;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/tabbable.css b/core/src/main/java/io/onedev/server/web/component/tabbable/tabbable.cssnew file mode 100644index 0000000000..b1408a5022--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/tabbable/tabbable.css@@ -0,0 +1,14 @@+li.collapsed {+ display: none;+}+@media(max-width: 767px) {+ ul.nav-tabs>li.collapsed {+ display: block;+ }+ ul.nav-tabs>li.expanded {+ display: none;+ }+}+li.collapsed>a.multiple {+ cursor: pointer !important;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/group.css b/core/src/main/java/io/onedev/server/web/page/admin/group/group.cssindex c56933c34c..3a5679fa9e 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/group/group.css+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/group.css@@ -1,4 +1,4 @@-@media(max-width: 768px) {+@media(max-width: 767px) {#group>.sidebar {display: none;}diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.javaindex 81a141c02d..7f77945c27 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java@@ -113,6 +113,12 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {String label = StringUtils.describe(getSetting().getDefaultListFields().contains(field.getName()));cellItem.add(new ColumnFragment(componentId, rowModel, label, false));}++ @Override+ public String getCssClass() {+ return "display-in-issue-list";+ }+});IDataProvider<InputSpec> dataProvider = new ListDataProvider<InputSpec>() {diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.cssindex ee1497df23..018ac4e20f 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css@@ -32,3 +32,9 @@#issue-setting .default-queries th.property-name {width: 30%;}+@media(max-width: 767px) {+ #issue-setting .display-in-issue-list, .field-spec .property-displayInIssueList,+ .field-spec-edit .property-displayInIssueList {+ display: none;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/user.css b/core/src/main/java/io/onedev/server/web/page/admin/user/user.cssindex decb25b13d..addca82fc1 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/user.css+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/user.css@@ -1,4 +1,4 @@-@media(max-width: 768px) {+@media(max-width: 767px) {#user>.sidebar {display: none;}diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.cssindex 20f6cc3c2c..8f407df85c 100644--- a/core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css@@ -68,6 +68,10 @@ body {table .row-selector {width: 24px;}+table>thead>tr>th {+ white-space: nowrap;+}+.navigator {text-align: center;}@@ -75,11 +79,6 @@ table .row-selector {display: none;}-a.disabled {- color: #999 !important;- text-decoration: none;-}-a.wicket_orderUp:after, a.wicket_orderDown:after, a.wicket_orderNone:after {font-family: FontAwesome;font-weight: normal;@@ -494,10 +493,11 @@ input.search {}.list>.head {- margin-bottom: 20px;+ margin-bottom: 12px;}.list>.head>.pull-left {margin-right: 20px;+ margin-bottom: 8px;}table>tbody>tr>td.actions a {@@ -626,6 +626,8 @@ a.input-clear.input-group-clear {a.disabled, a[disabled="disabled"] {cursor: default;+ color: #AAA !important;+ text-decoration: none;}.floating {@@ -681,7 +683,7 @@ a.disabled, a[disabled="disabled"] {.floating.side.def-detail {width: 480px;}-@media(max-width: 768px) {+@media(max-width: 767px) {.floating.side.def-detail {width: 300px;}@@ -691,13 +693,3 @@ a.disabled, a[disabled="disabled"] {margin-bottom: 12px;}-@media(min-width: 992px) {- .modal-xl {- width: 900px;- }-}-@media(min-width: 1292px) {- .modal-xl {- width: 1200px;- }-}diff --git a/core/src/main/java/io/onedev/server/web/page/layout/layout.css b/core/src/main/java/io/onedev/server/web/page/layout/layout.cssindex e6128fbb20..eb5aee9691 100644--- a/core/src/main/java/io/onedev/server/web/page/layout/layout.css+++ b/core/src/main/java/io/onedev/server/web/page/layout/layout.css@@ -53,7 +53,7 @@padding: 4px 20px 0 20px;}-@media (max-width: 768px) {+@media (max-width: 767px) {.navbar .help .icon,.navbar .signed-in .avatar,.navbar .signed-in .dropdown-header,diff --git a/core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html b/core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.htmlindex fdfc4ab575..7afaf461f4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html@@ -1,9 +1,10 @@<wicket:extend>+ <div class="page-title">New Project</div><div class="new-project"><form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div><div class="actions">- <input class="btn btn-primary dirty-aware" value="Create" type="submit"></input>+ <input class="btn btn-primary dirty-aware" value="Create" type="submit"></div></form></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html b/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.htmlindex afec0d79dd..fd2e061aa1 100644--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html@@ -1,11 +1,12 @@<wicket:extend>+ <div class="page-title">Projects</div><div class="project list"><div class="head clearfix"><div class="pull-left clearable-wrapper"><input wicket:id="filterProjects" class="form-control search" placeholder="Filter projects"></div><div class="pull-left">- <a wicket:id="createProject" class="btn btn-default"><i class="fa fa-plus"></i> Create Project</a>+ <a wicket:id="createProject" class="btn btn-default"><i class="fa fa-plus"></i> Create</a></div><div class="pull-left"><a wicket:id="showOrphanProjects" class="btn btn-default"><i class="fa fa-ext fa-repo"></i> Orphan Projects</a>diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css b/core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.cssindex cf7337a95a..8eabf3bec6 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css@@ -1,3 +1,15 @@+body.ProjectBlobPage {+ min-width: 600px;+}+body.ProjectBlobPage.additionalWidth1 {+ min-width: 900px;+}+body.ProjectBlobPage.additionalWidth2 {+ min-width: 1200px;+}+body.ProjectBlobPage.additionalWidth3 {+ min-width: 1500px;+}#project-blob {margin: -20px;background: white;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js b/core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.jsindex 2c873db630..1fcba71b20 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js@@ -28,6 +28,17 @@ onedev.server.projectBlob = {$(window).resize(function(e) {e.stopPropagation();+ var additionalWidth = 0;+ if ($(".source-view .CodeMirror-annotations").length != 0)+ additionalWidth ++;+ if ($(".source-view>.comment").length != 0)+ additionalWidth ++;+ if ($(".source-view>.outline").length != 0)+ additionalWidth ++;++ $("body").removeClass("additionalWidth1").removeClass("additionalWidth2")+ .removeClass("additionalWidth3").addClass("additionalWidth" + additionalWidth);+var $head = $("#project-blob>.head");var $revisionPicker = $head.find(">.revision-picker");var $operations = $head.find(">.operations");@@ -52,7 +63,7 @@ onedev.server.projectBlob = {var $blobContent = $("#project-blob>.blob-content");- var minWindowWidth = onedev.server.projectBlob.parseCssDimension($("#layout").css("min-width"));+ var minWindowWidth = onedev.server.projectBlob.parseCssDimension($("body").css("min-width"));var windowWidth = $(window).width();if (windowWidth < minWindowWidth) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex 275c4c58df..2fbc29ae99 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -481,7 +481,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMepublic void onClick(AjaxRequestTarget target) {clearComment(target);target.appendJavaScript("onedev.server.sourceView.mark(undefined);");- target.appendJavaScript("onedev.server.sourceView.onLayoutChange();");+ target.appendJavaScript("$(window).resize();");context.onMark(target, null);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.jsindex b2cd9dec86..7b725dca60 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js@@ -400,7 +400,7 @@ onedev.server.sourceView = {comments.push(comment);onedev.server.sourceView.addCommentGutter(line, comments);onedev.server.sourceView.highlightCommentTrigger();- onedev.server.sourceView.onLayoutChange();+ $(window).resize();},onCommentDeleted: function(comment) {var $sourceView = $(".source-view");@@ -423,14 +423,10 @@ onedev.server.sourceView = {onedev.server.sourceView.addCommentGutter(line, comments);}onedev.server.sourceView.highlightCommentTrigger();- onedev.server.sourceView.onLayoutChange();+ $(window).resize();onedev.server.sourceView.mark(undefined);},- onLayoutChange: function() {- $sourceView = $('.source-view');- $sourceView.triggerHandler('autofit', [$sourceView.outerWidth(), $sourceView.outerHeight()]);- },onAddComment: function(mark) {onedev.server.sourceView.exitFullScreen();var $sourceView = $(".source-view");@@ -440,7 +436,7 @@ onedev.server.sourceView = {var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;onedev.server.codemirror.clearSelection(cm);- onedev.server.sourceView.onLayoutChange();+ $(window).resize();// Mark again to make sure marked text still exists in viewport after layout changeonedev.server.sourceView.mark(mark);@@ -455,7 +451,7 @@ onedev.server.sourceView = {$sourceView.data("openComment", comment);$sourceView.data("mark", comment.mark);onedev.server.sourceView.highlightCommentTrigger();- onedev.server.sourceView.onLayoutChange();+ $(window).resize();// Mark again to make sure marked text still exists in viewport after layout changeonedev.server.sourceView.mark(comment.mark);@@ -464,12 +460,12 @@ onedev.server.sourceView = {var $sourceView = $(".source-view");$sourceView.removeData("openComment");onedev.server.sourceView.highlightCommentTrigger();- onedev.server.sourceView.onLayoutChange();+ $(window).resize();onedev.server.sourceView.mark(undefined);},onToggleOutline: function() {onedev.server.sourceView.exitFullScreen();- onedev.server.sourceView.onLayoutChange();+ $(window).resize();$(".outline-toggle").prop("checked", $(".source-view>.outline").is(":visible"));},highlightCommentTrigger: function() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/search-result.css b/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/search-result.cssindex ba4168a599..89b858d79b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/search-result.css+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/search-result.css@@ -16,9 +16,6 @@.search-result>.head a {color: #666;}-.search-result>.head a[disabled=disabled] {- color: #AAA;-}.search-result>.head em {margin-right: 8px;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex 7ed2b4414d..c82355d1d4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -444,12 +444,12 @@ public class ProjectBranchesPage extends ProjectPage {item.add(link);RevCommit lastCommit = getProject().getRevCommit(ref.getRef().getObjectId());-+ String lastCommitHash = lastCommit.name();item.add(new BuildsStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {@Overrideprotected List<Build> load() {- return OneDev.getInstance(BuildManager.class).query(getProject(), lastCommit.name());+ return OneDev.getInstance(BuildManager.class).query(getProject(), lastCommitHash);}}));diff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css b/core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.cssindex 26a78d9d97..2f4293f6f8 100644--- a/core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css@@ -17,9 +17,6 @@#project-branches>.list>table>tbody>tr:hover .detail .make-default {display: inline;}-#project-branches>.list>table td.detail>.title {- height: 24px;-}#project-branches>.list>table td.detail>.title>.name {font-weight: bold;font-size: 15px;diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.htmlindex 902fcf049f..5380a46e9c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html@@ -18,12 +18,12 @@<span wicket:id="contributorAvatars"></span><span wicket:id="contribution"></span></div>- <div wicket:id="parents" class="parents pull-right"></div>- <div class="commit pull-right">+ <div class="commit pull-left"><span wicket:id="buildStatus" class="build-status"></span><span wicket:id="hash" class="hash"></span><a wicket:id="copyHash"><i class="fa fa-clipboard"></i></a></div>+ <div wicket:id="parents" class="parents pull-right"></div></div></div><div wicket:id="revisionDiff"></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.htmlindex 7372bbf7d5..83d146d951 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html@@ -42,6 +42,11 @@<div wicket:id="contribution"></div></div><div class="pull-right actions">+ <span wicket:id="buildStatus"></span>+ <span class="btn-group">+ <a wicket:id="hashLink" class="btn btn-default"><span wicket:id="hash"></span></a>+ <a wicket:id="copyHash" class="btn btn-default"><i class="fa fa-clipboard"></i></a>+ </span><span class="btn-group"><a wicket:id="browseCode" title="Browse code" class="btn btn-default"><i class="fa fa-file-text-o"></i></a><wicket:enclosure>@@ -49,13 +54,6 @@</wicket:enclosure></span></div>- <div class="pull-right hash">- <span wicket:id="buildStatus"></span>- <span class="btn-group">- <a wicket:id="hashLink" class="btn btn-default"><span wicket:id="hash"></span></a>- <a wicket:id="copyHash" class="btn btn-default"><i class="fa fa-clipboard"></i></a>- </span>- </div></wicket:fragment><wicket:fragment wicket:id="dateFrag"><i class="fa fa-calendar"></i> <span wicket:id="date"></span>diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/project-commits.css b/core/src/main/java/io/onedev/server/web/page/project/commits/project-commits.cssindex 962d45f33a..ef436d4254 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/project-commits.css+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/project-commits.css@@ -14,9 +14,11 @@}#project-commits>.main>.body li {padding: 4px 0;+ position: relative;}#project-commits>.main>.body li.commit>.avatar {margin-top: 4px;+ position: absolute;}#project-commits>.main>.body .label {margin: 3px 0 0 4px;@@ -29,9 +31,10 @@font-size: 15px;}#project-commits>.main>.body .commit>.detail {- padding-left: 8px;+ padding-left: 48px;padding-right: 8px;}+#project-commits>.main>.body li.commit:hover, #project-commits>.main>.body li.commit.hover {background: #F7ECB9;}@@ -44,15 +47,9 @@#project-commits>.main>.body .message-and-labels {margin-bottom: 4px;}-#project-commits>.main>.body .actions {+#project-commits>.main>.body .actions>* {margin: 6px 0 0 8px;}-#project-commits>.main>.body .hash {- margin-top: 6px;-}-#project-commits>.main>.body .actions .compare {- color: #777;-}#project-commits>.main>.body>.list {margin-bottom: 0;}@@ -69,3 +66,10 @@text-align: left;border-bottom: 1px solid #EEE;}++@media(max-width: 767px) {+ #project-commits li.commit>.actions {+ display: none;+ }+}+diff --git a/core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css b/core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.cssindex 038f79b121..a66480fa6c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css+++ b/core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css@@ -46,4 +46,4 @@#revision-compare .with-merge-base ul>li.commit:last-child {opacity: 0.6;-}+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex 6137fbf930..061346f6e9 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -121,7 +121,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {@Overrideprotected String getModalCssClass() {- return "modal-xl";+ return "modal-lg";}private Component newCardDetail(String id, ModalPanel modal, IModel<Issue> issueModel, QueryPosition position) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.cssindex 075650c220..6d8e0948e8 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css@@ -1,3 +1,14 @@+body.IssueDetailPage {+ min-width: 760px;+}+@media(max-width: 1090px) {+ ul.nav-tabs>li.collapsed {+ display: block;+ }+ ul.nav-tabs>li.expanded {+ display: none;+ }+}#issue-detail {display: table;width: 100%;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.htmlindex a1210664b5..691659c0e0 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html@@ -11,7 +11,7 @@<a wicket:id="sort" class="btn btn-default">Sort <i class="fa fa-caret-down"></i></a></div><div class="pull-right">- <a wicket:id="newMilestone" class="btn btn-success"><i class="fa fa-plus"></i> New Milestone</a>+ <a wicket:id="newMilestone" class="btn btn-success"><i class="fa fa-plus"></i> Create</a></div></div><div class="body">diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/milestones.css b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/milestones.cssindex 6b074569ba..8a02ef623d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/milestones.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/milestones.css@@ -7,19 +7,24 @@#milestone-list>.body tbody a {margin-right: 8px;}+#milestone-list>.body tbody .actions {+ white-space: nowrap;+}#milestone-list>.body tbody .actions a {color: #666;}-.issue-stats .progress {+.issue-stats>.progress {float: left;- width: 300px;+ width: 200px;+ margin-bottom: 0;}-.issue-stats .text {+.issue-stats>.text {float: left;- margin-right: 20px;+ margin-right: 16px;+ margin-bottom: 4px;}-.issue-stats .text a:first-child {+.issue-stats>.text a:first-child {margin-right: 8px;}.milestone-sort.active:before {@@ -34,8 +39,12 @@#milestone-detail>* {margin-bottom: 20px;}+#milestone-detail>.title {+ margin-bottom: 12px;+}#milestone-detail>.title>* {margin-right: 20px;+ margin-bottom: 8px;}#milestone-detail>.title>.status {margin-right: 10px;@@ -53,7 +62,4 @@background: #F5F5F5;border-radius: 4px;padding: 20px;-}-#milestone-detail .progress {- width: 200px;}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/project.css b/core/src/main/java/io/onedev/server/web/page/project/project.cssindex acf85357c5..4f20141c0a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/project.css+++ b/core/src/main/java/io/onedev/server/web/page/project/project.css@@ -1,4 +1,4 @@-@media(max-width: 768px) {+@media(max-width: 767px) {#project>.sidebar {display: none;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.htmlindex 62bb6e2abe..c61ac3c836 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html@@ -1,13 +1,17 @@<wicket:extend><div id="request-detail"><div class="main">- <div wicket:id="requestHead" class="title clearfix">- <div wicket:id="title" class="title pull-left"></div>+ <div wicket:id="requestHead" class="title">+ <div wicket:id="title" class="title"></div><a wicket:id="editLink" title="Edit title" class="edit"><i class="fa fa-pencil"></i></a>- <form wicket:id="editForm" class="pull-left form-inline clearable-wrapper">- <input wicket:id="title" type="text" placeholder="Input title" class="form-control">- <input wicket:id="save" type="submit" value="Save" class="btn btn-primary"/>- <input wicket:id="cancel" type="button" value="Cancel" class="btn btn-default"/>+ <form wicket:id="editForm" class="form">+ <div class="clearable-wrapper">+ <input wicket:id="title" type="text" placeholder="Input title" class="form-control">+ </div>+ <div class="actions">+ <input wicket:id="save" type="submit" value="Save" class="btn btn-primary"/>+ <input wicket:id="cancel" type="button" value="Cancel" class="btn btn-default"/>+ </div></form></div><div wicket:id="statusAndBranches" class="status-and-branches clearfix">@@ -117,6 +121,6 @@</form></wicket:fragment><wicket:fragment wicket:id="codeCommentsTabLinkFrag">- <a wicket:id="link"><i class="fa fa-circle"></i> Code Comments</a>+ <a wicket:id="link" class="code-comments">Code Comments <i class="fa fa-circle"></i></a></wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.cssindex a0967fa042..99d077f808 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css@@ -17,16 +17,16 @@border-bottom: none;}#request-detail>.main>.activities .activity>td.avatar {- width: 40px;+ width: 1px;border-left: 4px solid white;- padding-left: 12px;+ padding-left: 8px;}#request-detail>.main>.activities .activity>td.avatar .avatar {width: 40px;height: 40px;}#request-detail>.main>.activities .activity>td.content {- padding-left: 20px;+ padding-left: 16px;}#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content .alert {margin: 16px 0;@@ -111,3 +111,19 @@#request-detail>.main>.activities .activity>td.content .plain.diff {margin-bottom: 12px;}++@media(max-width: 767px) {+ #request-detail>.main>.activities .activity>td.avatar .avatar {+ width: 24px;+ height: 24px;+ }+ #request-detail>.main>.activities .activity>td.content {+ padding-left: 6px;+ }+ #request-detail>.main>.activities .activity>td>.body {+ margin-top: 12px;+ margin-left: -24px;+ }+}++diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.cssindex adb19ed5b5..4d15689266 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css@@ -1,3 +1,15 @@+body.PullRequestDetailPage {+ min-width: 760px;+}+@media(max-width: 1270px) {+ ul.nav-tabs>li.collapsed {+ display: block;+ }+ ul.nav-tabs>li.expanded {+ display: none;+ }+}+#request-detail {display: table;width: 100%;@@ -11,6 +23,9 @@#request-detail>.main>div {margin-bottom: 20px;}+#request-detail>.main>.title>* {+ display: inline;+}#request-detail>.main>.title {font-size: 20px;font-weight: bold;@@ -22,13 +37,8 @@margin-left: 8px;}#request-detail>.main>.title input[type=text] {- width: 400px;font-weight: normal;}-#request-detail>.main>.title .input-clear {- right: auto;- left: 373px;-}#request-detail>.main>.title .alert {font-weight: normal;font-size: 14px;@@ -36,6 +46,10 @@#request-detail>.main>.status-and-branches {font-size: 16px;line-height: 20px;+ margin-bottom: 12px;+}+#request-detail>.main>.status-and-branches>* {+ margin-bottom: 8px;}#request-detail>.main>.status-and-branches>.status {font-size: 16px;@@ -72,11 +86,12 @@margin-bottom: 16px;}-#request-detail>.main>ul.tabs>li>a .fa-circle {+ul>li>a.code-comments .fa-circle {color: #4667EE;display: none;+ margin-left: 4px;}-#request-detail>.main>ul.tabs>li>a.new .fa-circle {+ul>li>a.code-comments.new .fa-circle {display: inline;}@@ -90,10 +105,6 @@color: #666;top: 0;}-#request-detail>.side>.nav a[disabled] {- color: #BBB;- cursor: default;-}#request-detail>.side>.nav .prev {left: 0;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.htmlindex b85e57e057..5834de26b1 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html@@ -12,11 +12,10 @@</span></div></form>- <a wicket:id="newRequest" class="open-new btn btn-success"><i class="fa fa-plus"></i> New Pull Request</a>+ <a wicket:id="newRequest" class="open-new btn btn-success"><i class="fa fa-plus"></i> Create</a><div wicket:id="others" class="others clearfix"><a wicket:id="showSavedQueries" class="show-saved-queries pull-left"><i class="fa fa-eye"></i> Show Saved Queries</a><a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a>- <div wicket:id="pageInfo" class="page-info pull-right"></div></div></div><div class="body">diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.javaindex 0cd539cc22..38c10e97cd 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java@@ -17,7 +17,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulatoimport org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigatorLabel;import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;@@ -363,6 +362,15 @@ public class PullRequestListPage extends ProjectPage {});+ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Status")) {++ @Override+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {+ cellItem.add(new RequestStatusLabel(componentId, rowModel));+ }++ });+columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Title")) {@Override@@ -390,15 +398,6 @@ public class PullRequestListPage extends ProjectPage {});- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Status")) {-- @Override- public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {- cellItem.add(new RequestStatusLabel(componentId, rowModel));- }-- });-columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Source")) {@Override@@ -412,6 +411,11 @@ public class PullRequestListPage extends ProjectPage {}}+ @Override+ public String getCssClass() {+ return "expanded";+ }+});columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Last Update")) {@@ -422,6 +426,11 @@ public class PullRequestListPage extends ProjectPage {cellItem.add(new Label(componentId, DateUtils.formatAge(request.getUpdateDate())));}+ @Override+ public String getCssClass() {+ return "expanded";+ }+});SortableDataProvider<PullRequest, Void> dataProvider = new SortableDataProvider<PullRequest, Void>() {@@ -495,16 +504,6 @@ public class PullRequestListPage extends ProjectPage {}});- others.add(new NavigatorLabel("pageInfo", requestsTable) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(requestsTable.getItemCount() != 0);- }-- });-}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/pull-request-list.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/pull-request-list.cssindex 26d6cee82d..54a335c58a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/pull-request-list.css+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/pull-request-list.css@@ -1,3 +1,6 @@+#request-list>.main {+ min-width: 330px;+}#request-list>.main>.head {position: relative;}@@ -5,7 +8,7 @@margin-bottom: 20px;}#request-list>.main>.head>form {- margin-right: 168px;+ margin-right: 100px;}#request-list>.main>.head>.open-new {position: absolute;@@ -16,10 +19,8 @@margin-right: 16px;color: #666;}-#request-list>.main>.head>.others a[disabled] {- text-decoration: none;- color: #999;- cursor: default;+#request-list>.main>.head>.others>*:last-child {+ margin-right: 0;}#request-list>.main>.body .new-indicator {width: 4px;@@ -27,4 +28,9 @@}#request-list>.main>.body tr.request.new td.new-indicator {background: #4667EE;-}\ No newline at end of file+}+@media(max-width: 767px) {+ #request-list th.expanded, #request-list td.expanded {+ display: none;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.html b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.htmlindex 0b171b4110..8cdf8e720d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.html@@ -11,7 +11,7 @@</div><div class="modal-footer clearfix"><input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save as Mine">- <a wicket:id="saveForAll" class="dirty-aware btn btn-primary">Save for All Users</a>+ <a wicket:id="saveForAll" class="dirty-aware btn btn-primary">Save for All</a><a wicket:id="cancel" class="btn btn-default">Cancel</a></div></form>diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.css b/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.cssindex 5cf8154186..b4492f106d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.css+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.css@@ -13,10 +13,6 @@margin-right: 8px;font-size: 16px;}-.saved-queries>.head>.actions>a[disabled] {- color: #AAA;- cursor: default;-}.saved-queries>.head>.actions .close-saved-queries {font-size: 17px;display: inline-block;@@ -75,15 +71,8 @@}.query-save-support>.main {vertical-align: top;+ min-width: 330px;}.query-save-support>.side+.main {padding-left: 20px;-}-.query-save-support>.main .save-query {- color: #666;-}-.query-save-support>.main .save-query[disabled] {- text-decoration: none;- color: #999;- cursor: default;}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css b/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.cssindex 42752ce313..f3cb638cc0 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css@@ -1,4 +1,7 @@-@media(max-width: 768px) {+body.BranchProtectionPage, body.WebHooksPage {+ min-width: 768px;+}+@media(max-width: 767px) {#project-setting>.sidebar {display: none;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css b/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.cssindex f85cff8ea2..b06190d90e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css@@ -1,3 +1,6 @@+body.SourceLinesPage {+ min-width: 300px;+}#project-contribs .options {margin-bottom: 20px;padding-bottom: 8px;diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js b/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.jsindex 4c97005ceb..bf7117fef9 100644--- a/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js@@ -384,14 +384,14 @@ onedev.server.stats = {var useKilo;var option = {title: {- text: 'Source lines of code on ' + defaultBranch + ' branch',+ text: 'SLOC on ' + defaultBranch,left: 'center',top: 10},grid: {left: '60px',right: '40px',- top: '80px',+ top: '120px',bottom: '40px'},xAxis: {diff --git a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.javaindex c908dad617..0a36f4826c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java@@ -267,11 +267,12 @@ public class ProjectTagsPage extends ProjectPage {link.add(new Label("name", tagName));item.add(link);+ String tagCommitHash = ref.getPeeledObj().name();item.add(new BuildsStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {@Overrideprotected List<Build> load() {- return OneDev.getInstance(BuildManager.class).query(getProject(), ref.getPeeledObj().name());+ return OneDev.getInstance(BuildManager.class).query(getProject(), tagCommitHash);}}));