The Unified and Autonomous Development Platform
Display normally on mobile devices by specifying minimum width of the page
Robin Shen6d1e41495679
diff --git a/core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css b/core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.cssindex d2fd048c25..cd1d11e304 100644--- a/core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css+++ b/core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css@@ -28,6 +28,7 @@padding-right: 12px;font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;font-size: 12px;+ white-space: nowrap;}.input-assist .help {margin-top: 8px;diff --git a/core/src/main/java/io/onedev/server/web/component/modal/ModalLink.java b/core/src/main/java/io/onedev/server/web/component/modal/ModalLink.javaindex e10a1660a1..e90419a951 100644--- a/core/src/main/java/io/onedev/server/web/component/modal/ModalLink.java+++ b/core/src/main/java/io/onedev/server/web/component/modal/ModalLink.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.modal;+import javax.annotation.Nullable;+import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -9,23 +11,16 @@ public abstract class ModalLink extends AjaxLink<Void> {private ModalPanel modal;- private final ModalPanel.Size size;-- public ModalLink(String id, ModalPanel.Size size) {+ public ModalLink(String id) {super(id);- this.size = size;}- public ModalLink(String id) {- this(id, ModalPanel.Size.MEDIUM);- }-@Overridepublic void onClick(AjaxRequestTarget target) {// if modal has not been created, or has been removed from page// when the same page instance is refreshedif (modal == null || modal.getParent() == null) {- modal = new ModalPanel(target, size) {+ modal = new ModalPanel(target) {@Overrideprotected Component newContent(String id) {@@ -37,10 +32,20 @@ public abstract class ModalLink extends AjaxLink<Void> {super.onClosed();modal = null;}++ @Override+ protected String getCssClass() {+ return getModalCssClass();+ }};}}+ @Nullable+ protected String getModalCssClass() {+ return null;+ }+protected abstract Component newContent(String id, ModalPanel modal);}diff --git a/core/src/main/java/io/onedev/server/web/component/modal/ModalPanel.java b/core/src/main/java/io/onedev/server/web/component/modal/ModalPanel.javaindex 30f38397e0..5c1637abc1 100644--- a/core/src/main/java/io/onedev/server/web/component/modal/ModalPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/modal/ModalPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.modal;+import javax.annotation.Nullable;+import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;@@ -16,21 +18,11 @@ import io.onedev.server.web.page.base.BasePage;@SuppressWarnings("serial")public abstract class ModalPanel extends Panel {- public enum Size {SMALL, MEDIUM, LARGE}-private static final String CONTENT_ID = "content";- private final Size size;-public ModalPanel(AjaxRequestTarget target) {- this(target, Size.MEDIUM);- }-- public ModalPanel(AjaxRequestTarget target, Size size) {super(((BasePage)target.getPage()).getRootComponents().newChildId());- this.size = size;-BasePage page = (BasePage) target.getPage();page.getRootComponents().add(this);target.prependJavaScript(String.format("$('body').append(\"<div id='%s'></div>\");", getMarkupId()));@@ -45,11 +37,10 @@ public abstract class ModalPanel extends Panel {add(dialog);dialog.add(newContent(CONTENT_ID));-- if (size == Size.LARGE)- dialog.add(AttributeAppender.append("class", "modal-lg"));- else if (size == Size.SMALL)- dialog.add(AttributeAppender.append("class", "modal-sm"));++ String cssClass = getCssClass();+ if (cssClass != null)+ dialog.add(AttributeAppender.append("class", cssClass));add(new AbstractPostAjaxBehavior() {@@ -77,6 +68,11 @@ public abstract class ModalPanel extends Panel {}protected abstract Component newContent(String id);++ @Nullable+ protected String getCssClass() {+ return null;+ }public Component getContent() {return get(CONTENT_ID);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 3454a0aac1..ee1497df23 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@@ -29,21 +29,6 @@height: 24px;border-radius: 3px;}--#issue-setting .default-queries th {- font-weight: bold !important;- padding-bottom: 12px;-}-#issue-setting .default-queries td {- padding: 8px 16px 8px 0;-}-#issue-setting .default-queries>.property.editor {- padding: 10px;- border-radius: 4px;- background: #F9F9F9;- border: 1px solid #E8E8E8;+#issue-setting .default-queries th.property-name {+ width: 30%;}-#issue-setting .default-queries .editable .bean.list>thead>tr>th {- border-bottom: none;- padding-bottom: 4px;-}\ No newline at end of filediff --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 e232f70456..f8b48268dc 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@@ -196,6 +196,7 @@ form>.test-feedback {.editor>table.list>tbody>tr>td.actions {text-align: right;+ white-space: nowrap;}.editor>table.list>tbody>tr>td.actions .fa {vertical-align: center;@@ -230,9 +231,6 @@ form>.test-feedback {.viewer .type-selector, .viewer .no-elements, .editor .no-elements {font-style: italic;}-.editable .bean.list>thead>tr>th {- border-bottom: 1px solid #E0E0E0;-}.editable .viewer .bean.list>thead>tr>th {font-size: 12px;padding-top: 0;@@ -241,7 +239,12 @@ form>.test-feedback {}.editable table.bean.list>thead>tr>th, .editable table.bean.list>tbody>tr>td {padding: 5px 10px 5px 0;- font-weight: normal;+}+.editable table.bean.list>thead>tr>th.actions, .editable table.bean.list>tbody>tr>td.actions {+ padding-right: 0;+ padding-left: 10px;+ width: 1%;+ vertical-align: middle;}.editable .editor table.bean.list tr:hover td {background: #F9F9F9;@@ -664,6 +667,23 @@ a.disabled, a[disabled="disabled"] {.floating.side.def-detail {width: 480px;}+@media(max-width: 768px) {+ .floating.side.def-detail {+ width: 300px;+ }+}+.floating.side.def-detail .actions {margin-bottom: 12px;-}\ No newline at end of file+}++@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/base/base.js b/core/src/main/java/io/onedev/server/web/page/base/base.jsindex d990261a0a..6d398c1755 100644--- a/core/src/main/java/io/onedev/server/web/page/base/base.js+++ b/core/src/main/java/io/onedev/server/web/page/base/base.js@@ -298,7 +298,9 @@ onedev.server = {if ($this.closest(".no-autofocus").length == 0) {if ($this.hasClass("CodeMirror") && $this[0].CodeMirror.options.readOnly == false) {$this[0].CodeMirror.focus();- } else if ($this.closest(".select2-container").length == 0) {+ } else if ($this.closest(".select2-container").length == 0+ && $this.attr("readonly") != "readonly"+ && $this.attr("disabled") != "disabled") {$this.focus();}return false;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 a7e661ea37..36025b3f4a 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@@ -35,7 +35,7 @@}#layout {- min-width: 800px;+ min-width: 1050px;}#layout>.body {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.htmlindex 2aaab3388c..c8d569e820 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html@@ -25,7 +25,7 @@</div><div wicket:id="symbolTooltip"></div><wicket:fragment wicket:id="outlineNodeFrag">- <img wicket:id="icon"></img> <a wicket:id="link"><span wicket:id="label"></span></a>+ <img wicket:id="icon"> <a wicket:id="link"><span wicket:id="label"></span></a></wicket:fragment><wicket:fragment wicket:id="outlineSearchFrag"><div class="outline-search">@@ -34,13 +34,13 @@<h4 class="modal-title">Outline Search</h4></div><div class="modal-body">- <input wicket:id="input" class="form-control"></input>+ <input wicket:id="input" class="form-control"><div wicket:id="result" class="result"></div></div></div></wicket:fragment><wicket:fragment wicket:id="outlineSearchNodeFrag">- <a wicket:id="link" class="selectable"><img wicket:id="icon"></img> <span wicket:id="label"></span></a>+ <a wicket:id="link" class="selectable"><img wicket:id="icon"> <span wicket:id="label"></span></a></wicket:fragment><wicket:fragment wicket:id="newCommentFrag"><form wicket:id="form" class="new-comment leave-confirm">@@ -55,6 +55,6 @@</form></wicket:fragment><wicket:fragment wicket:id="actionsFrag">- <input type="checkbox" wicket:id="outline" class="outline-toggle"> Outline</input>+ <wicket:enclosure child="outline"><label><input type="checkbox" wicket:id="outline" class="outline-toggle"> Outline</label></wicket:enclosure></wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.htmlindex b9f1409e51..4035304e0a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html@@ -18,7 +18,7 @@<a wicket:id="delete"><i class="fa fa-trash"></i> Delete</a></wicket:container><a wicket:id="raw"><i class="fa fa-file-o"></i> Raw</a>- <input type="checkbox" wicket:id="blame"> Blame</input>+ <label><input type="checkbox" wicket:id="blame"> Blame</label><wicket:container wicket:id="extraActions"></wicket:container></div></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.css b/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.cssindex b413e87bb7..9bd633ca4a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.css+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.css@@ -22,3 +22,12 @@.blob-view>.head .actions>input {vertical-align: top;}+.blob-view>.head .actions label {+ font-weight: normal;+ margin-bottom: 0;+ display: inline-block;+}+.blob-view>.head .actions input[type=checkbox] {+ position: relative;+ top: 2px;+}diff --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 632ada5eaa..6137fbf930 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@@ -36,7 +36,6 @@ import io.onedev.server.web.component.issue.IssueStateLabel;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.modal.ModalPanel.Size;import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.util.QueryPosition;@@ -118,8 +117,13 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {add(avatarsView);- add(new ModalLink("detail", Size.LARGE) {+ add(new ModalLink("detail") {+ @Override+ protected String getModalCssClass() {+ return "modal-xl";+ }+private Component newCardDetail(String id, ModalPanel modal, IModel<Issue> issueModel, QueryPosition position) {return new CardDetailPanel(id, issueModel) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.cssindex 03c4a03227..ffbf24c2c1 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css@@ -168,7 +168,7 @@min-height: 600px;}.board-card-detail>.body>.main {- margin-right: 240px;+ margin-right: 320px;padding: 20px;}.board-card-detail>.body>.main>div {@@ -179,10 +179,18 @@top: 0;bottom: 0;right: 0;- width: 240px;+ width: 320px;padding: 20px;background: #FAFAFA;overflow: auto;border-left: 2px solid #E0E0E0;border-radius: 0 0 4px 0;}+@media (max-width: 992px) {+ .board-card-detail>.body>.main {+ margin-right: 0;+ }+ .board-card-detail>.body>.side {+ display: none;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.jsindex 4f895405c2..7e5d5444fa 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js@@ -4,24 +4,35 @@ onedev.server.issueBoards = {var $head = $("#issue-boards>.head");var $body = $("#issue-boards>.body");if ($body.length != 0) {- var ps = new PerfectScrollbar($body[0]);- $(window).resize(function() {- $body.outerHeight($(window).height()-$body.offset().top);- ps.update();- });+ // Do not use perfect scroll on Device as it may cause scroll issue+ if (onedev.server.util.isDevice()) {+ $(window).resize(function() {+ $body.outerHeight($(window).height()-$body.offset().top);+ });+ } else {+ var ps = new PerfectScrollbar($body[0]);+ $(window).resize(function() {+ $body.outerHeight($(window).height()-$body.offset().top);+ ps.update();+ });+ }}},onColumnDomReady: function(containerId, callback) {var $body = $("#" + containerId);- var ps = new PerfectScrollbar($body[0]);-- // Scroll bar will not show in the flex box without this line- setTimeout(function() {ps.update();}, 100);-- $(window).resize(function() {- ps.update();- });+ // Do not use perfect scroll on Device as it may cause scroll issue+ if (!onedev.server.util.isDevice()) {+ var ps = new PerfectScrollbar($body[0]);++ // Scroll bar will not show in the flex box without this line+ setTimeout(function() {ps.update();}, 100);++ $(window).resize(function() {+ ps.update();+ });+ }+if (callback) {$body.droppable({accept: function($draggable) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailCssResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailCssResourceReference.javanew file mode 100644index 0000000000..40d6ed36fc--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.project.issues.detail;++import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class IssueDetailCssResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public IssueDetailCssResourceReference() {+ super(IssueDetailCssResourceReference.class, "issue-detail.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex f7a35d2b0f..3c3f8db55b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -11,9 +11,8 @@ import javax.persistence.EntityNotFoundException;import org.apache.wicket.Component;import org.apache.wicket.Page;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.IModel;@@ -243,8 +242,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new IssueDetailResourceReference()));- response.render(OnDomReadyHeaderItem.forScript("onedev.server.issueDetail.onDomReady();"));+ response.render(CssHeaderItem.forReference(new IssueDetailCssResourceReference()));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailResourceReference.javadeleted file mode 100644index ab98d4f013..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailResourceReference.java+++ /dev/null@@ -1,30 +0,0 @@-package io.onedev.server.web.page.project.issues.detail;--import java.util.List;--import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.HeaderItem;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;--import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;-import io.onedev.server.web.page.base.BaseDependentResourceReference;--public class IssueDetailResourceReference extends BaseDependentResourceReference {-- private static final long serialVersionUID = 1L;-- public IssueDetailResourceReference() {- super(IssueDetailResourceReference.class, "issue-detail.js");- }-- @Override- public List<HeaderItem> getDependencies() {- List<HeaderItem> dependencies = super.getDependencies();- dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));- dependencies.add(CssHeaderItem.forReference(- new BaseDependentCssResourceReference(IssueDetailResourceReference.class, "issue-detail.css")));- return dependencies;- }--}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 bd855a043e..075650c220 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,18 +1,19 @@+#issue-detail {+ display: table;+ width: 100%;+}+#issue-detail>* {+ display: table-cell;+}#issue-detail>.main {- margin-right: 360px;padding-right: 20px;}#issue-detail>.main>div {margin-bottom: 20px;}#issue-detail>.side {- position: fixed;- top: 48px;- right: 0;- bottom: 0;width: 360px;- border-left: 2px solid #E0E0E0;padding: 20px;- background: #FAFAFA;- overflow: auto;+ background: #F9F9F9;+ border-radius: 4px;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.js b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.jsdeleted file mode 100644index 1e9017de9a..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.js+++ /dev/null@@ -1,8 +0,0 @@-onedev.server.issueDetail = {- onDomReady: function() {- var ps = new PerfectScrollbar($("#issue-detail>.side")[0]);- $(window).resize(function() {- ps.update();- });- }-}diff --git a/core/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.html b/core/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.htmlindex d7e5afd327..7f9904ec75 100644--- a/core/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.html@@ -14,7 +14,7 @@<a wicket:id="forkNow">fork now</a></div><div wicket:id="description" class="description"></div>- <div class="clone">+ <div class="clone form-inline"><div class="input-group"><div class="input-group-addon">Clone URL</div><input wicket:id="cloneUrl" readonly="readonly" class="form-control"/>diff --git a/core/src/main/java/io/onedev/server/web/page/project/moreinfo/more-info.css b/core/src/main/java/io/onedev/server/web/page/project/moreinfo/more-info.cssindex d83ca4c789..bbe828a5aa 100644--- a/core/src/main/java/io/onedev/server/web/page/project/moreinfo/more-info.css+++ b/core/src/main/java/io/onedev/server/web/page/project/moreinfo/more-info.css@@ -1,6 +1,5 @@.project.more-info {padding: 20px;- width: 600px;}.project.more-info>div {margin-bottom: 20px;@@ -30,6 +29,9 @@.project.more-info>.clone {margin-bottom: 20px;}+.project.more-info>.clone>.input-group {+ width: 100%;+}.project.more-info>.clone input {background: white;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailCssResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailCssResourceReference.javanew file mode 100644index 0000000000..a7b23cccd2--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.project.pullrequests.detail;++import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class PullRequestDetailCssResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public PullRequestDetailCssResourceReference() {+ super(PullRequestDetailCssResourceReference.class, "pull-request-detail.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 8d6d681ef4..01a17e5fb0 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -37,9 +37,8 @@ import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.event.Broadcast;import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.DropDownChoice;@@ -393,13 +392,6 @@ public abstract class PullRequestDetailPage extends ProjectPage {WebMarkupContainer side = new WebMarkupContainer("side") {- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- String script = String.format("onedev.server.requestDetail.onSideDomReady('%s');", getMarkupId());- response.render(OnDomReadyHeaderItem.forScript(script));- }-@Overridepublic void onEvent(IEvent<?> event) {super.onEvent(event);@@ -1126,7 +1118,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {public void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new PullRequestDetailResourceReference()));+ response.render(CssHeaderItem.forReference(new PullRequestDetailCssResourceReference()));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailResourceReference.javadeleted file mode 100644index e309e6fbfb..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailResourceReference.java+++ /dev/null@@ -1,30 +0,0 @@-package io.onedev.server.web.page.project.pullrequests.detail;--import java.util.List;--import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.HeaderItem;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;--import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;-import io.onedev.server.web.page.base.BaseDependentResourceReference;--public class PullRequestDetailResourceReference extends BaseDependentResourceReference {-- private static final long serialVersionUID = 1L;-- public PullRequestDetailResourceReference() {- super(PullRequestDetailResourceReference.class, "pull-request-detail.js");- }-- @Override- public List<HeaderItem> getDependencies() {- List<HeaderItem> dependencies = super.getDependencies();- dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));- dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(- PullRequestDetailResourceReference.class, "pull-request-detail.css")));- return dependencies;- }--}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 448132f2c4..adb19ed5b5 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,6 +1,12 @@+#request-detail {+ display: table;+ width: 100%;+}+#request-detail>* {+ display: table-cell;+}#request-detail>.main {- margin-right: 360px;- pading-right: 20px;+ padding-right: 20px;}#request-detail>.main>div {margin-bottom: 20px;@@ -102,15 +108,9 @@}#request-detail>.side {- position: fixed;- top: 48px;- right: 0;- bottom: 0;width: 360px;- border-left: 2px solid #E0E0E0;padding: 20px;- background: #FAFAFA;- overflow: auto;+ background: #F9F9F9;}#request-detail>.side>* {margin-bottom: 20px;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.jsdeleted file mode 100644index 1fc6f23713..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js+++ /dev/null@@ -1,8 +0,0 @@-onedev.server.requestDetail = {- onSideDomReady: function(containerId) {- var ps = new PerfectScrollbar(document.getElementById(containerId));- $(window).resize(function() {- ps.update();- });- }-}diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.javaindex af6d0d5481..1dfa689682 100644--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java@@ -163,6 +163,11 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {setVisible(SecurityUtils.getUser() != null);}+ @Override+ protected String getModalCssClass() {+ return "modal-lg";+ }+private Component newUserQueriesEditor(String componentId, ModalPanel modal, ArrayList<T> userQueries) {return new NamedQueriesEditor(componentId, userQueries, null) {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 b2dffcd355..5cf8154186 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@@ -46,7 +46,7 @@.edit-saved-queries th {font-weight: bold !important;}-.edit-saved-queries th.name {+.edit-saved-queries th.property-name {width: 30%;}.edit-saved-queries>.property {@@ -55,9 +55,6 @@border-radius: 4px;padding: 10px;}-.edit-saved-queries td {- padding: 8px 16px 8px 0 !important;-}.edit-saved-queries .editable .bean.list>thead>tr>th {border-bottom: none;padding-bottom: 4px;@@ -89,5 +86,4 @@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 1edca961d8..754ec64ee3 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@@ -5,9 +5,6 @@/* make it absolute as we do not want to make it stay fixed to occupy screen space on mobile screen */position: absolute;z-index: 0;- /* use hacks below to make the sidebar extend to the screen bottom even if body does not reach to the bottom */- margin-bottom: -10000px;- padding-bottom: 10000px;width: 260px;}#project-setting>.sidebar>.tabs>li>a {