Skip to content

The Unified and Autonomous Development Platform

Fix various UI bugs

Robin Shen7eff2068356f
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js b/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js
index 3faa259ec0..c95a379794 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js
@@ -1,6 +1,6 @@
(function ( $ ) {
- var pageMargin = 0;
+ var pageMargin = 8;
var scrollbarWidth = 20;
var textHeight = 25;
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
index fcf25ce5bb..aa526405ca 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
+++ b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
@@ -1995,7 +1995,7 @@ h6, .h6 {
background-color: var(--primary);
}
.alert {
- padding: 0.75rem 1.25rem;
+ padding: 1rem 1.2rem;
border: 1px solid transparent;
border-radius: 0.42rem;
}
@@ -2098,84 +2098,47 @@ h6, .h6 {
color: var(--gray);
}
-.alert.alert-custom {
- display: flex;
- align-items: stretch;
- padding: 1.5rem 2rem;
-}
-.alert.alert-custom .alert-icon {
- display: flex;
- align-items: center;
- margin: 0 1.25rem 0 0;
- width: 24px;
- height: 24px;
-}
-.alert.alert-custom .alert-text {
- align-self: center;
- flex-grow: 1;
-}
-.alert.alert-custom .alert-close {
- padding: 0 0 0 1rem;
- display: flex;
- align-items: center;
- justify-content: flex-end;
- line-height: 0;
-}
-.alert.alert-custom .alert-close .close {
- text-shadow: none !important;
- cursor: pointer;
- line-height: 0;
- color: inherit;
-}
-
-.alert.alert-custom.alert-outline-primary {
+.alert.alert-outline-primary {
border-color: var(--primary);
color: var(--primary);
}
-.alert.alert-custom.alert-outline-secondary {
+.alert.alert-outline-secondary {
border-color: var(--secondary);
color: var(--secondary);
}
-.alert.alert-custom.alert-outline-success {
+.alert.alert-outline-success {
border-color: var(--success);
color: var(--success);
}
-.alert.alert-custom.alert-outline-warning {
+.alert.alert-outline-warning {
border-color: var(--warning);
color: var(--warning);
}
-.alert.alert-custom.alert-outline-danger {
+.alert.alert-outline-danger {
border-color: var(--danger);
color: var(--danger);
}
-.alert.alert-custom.alert-outline-info {
+.alert.alert-outline-info {
border-color: var(--info);
color: var(--info);
}
-.alert.alert-custom.alert-outline-dark {
+.alert.alert-outline-dark {
border-color: var(--dark);
color: var(--dark);
}
-.alert.alert-custom.alert-outline-2x {
+.alert.alert-outline-2x {
border-width: 2px;
}
-.alert.alert-custom.alert-outline-2x .close .icon {
- stroke: currentColor;
- stroke-width: 20px;
-}
-.alert.alert-custom.alert-notice {
+.alert.alert-notice {
border: 0;
border-left: 4px solid;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
-.alert.alert-custom.alert-white {
+.alert.alert-white {
background-color: white;
border-color: white;
}
-.alert.alert-custom.alert-shadow {
- box-shadow: 0px 0px 30px 0px rgba(82, 63, 105, 0.05);
-}
.shadow {
box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.1) !important;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/dragdrop/DragBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/dragdrop/DragBehavior.java
deleted file mode 100644
index 430b6695a8..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/behavior/dragdrop/DragBehavior.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.onedev.server.web.behavior.dragdrop;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-
-@SuppressWarnings("serial")
-public class DragBehavior extends Behavior {
-
- private String dragData;
-
- private String dragText;
-
- public DragBehavior(String dragData, String dragText) {
- this.dragData = dragData;
- this.dragText = dragText;
- }
-
- @Override
- public void bind(Component component) {
- super.bind(component);
- component.setOutputMarkupId(true);
- }
-
- @Override
- public boolean getStatelessHint(Component component) {
- return false;
- }
-
- @Override
- public void renderHead(Component component, IHeaderResponse response) {
- response.render(JavaScriptReferenceHeaderItem.forReference(new DragDropResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript(String.format("onedev.server.dragdrop.setupDraggable('#%s', '%s', '%s');",
- component.getMarkupId(), dragData, dragText)));
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/dragdrop/DragDropResourceReference.java b/server-core/src/main/java/io/onedev/server/web/behavior/dragdrop/DragDropResourceReference.java
deleted file mode 100644
index 3d735adb55..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/behavior/dragdrop/DragDropResourceReference.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.onedev.server.web.behavior.dragdrop;
-
-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.jqueryui.JQueryUIResourceReference;
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-import io.onedev.server.web.page.base.BaseDependentResourceReference;
-
-public class DragDropResourceReference extends BaseDependentResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public DragDropResourceReference() {
- super(DragDropResourceReference.class, "dragdrop.js");
- }
-
- @Override
- public List<HeaderItem> getDependencies() {
- List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
- dependencies.add(CssHeaderItem.forReference(
- new BaseDependentCssResourceReference(DragDropResourceReference.class, "dragdrop.css")));
- return dependencies;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/dragdrop/DropBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/dragdrop/DropBehavior.java
deleted file mode 100644
index e708d99ec4..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/behavior/dragdrop/DropBehavior.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.onedev.server.web.behavior.dragdrop;
-
-import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.request.IRequestParameters;
-import org.apache.wicket.request.cycle.RequestCycle;
-
-import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
-
-@SuppressWarnings("serial")
-public abstract class DropBehavior extends AbstractPostAjaxBehavior {
-
- @Override
- public void renderHead(Component component, IHeaderResponse response) {
- response.render(JavaScriptReferenceHeaderItem.forReference(new DragDropResourceReference()));
- String script = String.format("onedev.server.dragdrop.setupDroppable('#%s', %s, %s);",
- component.getMarkupId(), getAccept(), getCallbackFunction(explicit("dragData")));
- response.render(OnDomReadyHeaderItem.forScript(script));
- }
-
- @Override
- protected void respond(AjaxRequestTarget target) {
- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
- String dragData = params.getParameterValue("dragData").toString();
- onDropped(target, dragData);
- }
-
- protected abstract void onDropped(AjaxRequestTarget target, String dragData);
-
- protected abstract String getAccept();
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/dragdrop/dragdrop.css b/server-core/src/main/java/io/onedev/server/web/behavior/dragdrop/dragdrop.css
deleted file mode 100644
index f572f90450..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/behavior/dragdrop/dragdrop.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.ui-draggable-dragging {
- width: auto;
- white-space: nowrap;
- color: black;
- padding: 4px 8px;
- background: #F2F2F2;
- font-weight: bold;
- border: 2px solid #BBB;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/dragdrop/dragdrop.js b/server-core/src/main/java/io/onedev/server/web/behavior/dragdrop/dragdrop.js
deleted file mode 100644
index 530ffcd085..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/behavior/dragdrop/dragdrop.js
+++ /dev/null
@@ -1,21 +0,0 @@
-onedev.server.dragdrop = {
- setupDraggable: function(dragSelector, dragData, dragText) {
- $(dragSelector).draggable({
- cursor: 'move',
- helper: function(event) {
- return $('<span data-drag="' + dragData + '">' + dragText + '</span>');
- }
- });
- },
- setupDroppable: function(dropSelector, acceptSelector, callback) {
- $(dropSelector).droppable({
- hoverClass: 'drag-over',
- greedy: true,
- tolerance: 'pointer',
- accept: acceptSelector,
- drop: function(event, ui) {
- callback(ui.helper.data("drag"));
- }
- });
- }
-};
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html
index 0fcdb7e1b0..b9954823de 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html
@@ -1,6 +1,6 @@
<wicket:panel>
<div class="input-assist">
- <ul wicket:id="suggestions" class="suggestions overflow-auto list-unstyled">
+ <ul wicket:id="suggestions" class="suggestions autosuit list-unstyled">
<li wicket:id="suggestions" class="suggestion selectable">
<a class="d-flex align-items-center">
<span wicket:id="content" class="content text-nowrap font-size-sm mr-auto"></span>
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css
index b8bb8cad0e..ec853512b9 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css
@@ -14,6 +14,12 @@
list-style: disc;
margin-left: 1.5rem;
}
+.input-assist .help li a {
+ color: var(--primary);
+}
+.input-assist .help li a:hover, .input-assist .help li a:focus {
+ color: #0073e9;
+}
.input-error-mark {
background: url(wave.png) repeat-x bottom;
position: absolute;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.html b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.html
index a7b4421bfe..55b57238dd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.html
@@ -9,6 +9,6 @@
<a wicket:id="link"><wicket:svg href="tick" class="icon mr-2"/> <span wicket:id="label"></span></a>
</li>
</ul>
- <div wicket:id="noBranches" class="no-branches alert alert-light-warning mb-0 mt-4">No branches Found</div>
+ <div wicket:id="noBranches" class="no-branches alert alert-notice alert-light-warning mb-0 mt-4 px-4 py-3">No branches Found</div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.html
index 5bd2c0d6c0..19f529c462 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <pre class="build-log autofit flex-grow-1 rounded bg-black text-break text-white ps ps-scroll p-3 mb-0"></pre>
+ <pre class="build-log flex-grow-1 rounded bg-black text-break text-white p-3 mb-0 overflow-auto"></pre>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java
index 7003231b9a..2fa5c011a0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java
@@ -61,7 +61,7 @@ public class BuildLogPanel extends GenericPanel<Build> {
}
});
-
+
setOutputMarkupId(true);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.css b/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.css
index 6843fe4a99..ae697e8b9d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.css
@@ -1,4 +1,7 @@
-.build-log.ps.ps-scroll>.ps__rail-x>.ps__thumb-x,
-.build-log.ps.ps-scroll>.ps__rail-y>.ps__thumb-y {
- background: var(--muted);
-}
+.build-log {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html
index 72cc4744a9..1ccef69880 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html
@@ -1,8 +1,7 @@
<wicket:panel>
<div class="code-comment">
- <div wicket:id="outdatedContext" class="outdated-context alert alert-light-warning my-2">
- <wicket:svg href="warning" class="icon mr-1"></wicket:svg> Comment context outdated,
- <a wicket:id="link">click to update</a>
+ <div wicket:id="outdatedContext" class="outdated-context alert alert-notice alert-light-warning my-2">
+ Comment context outdated, <a wicket:id="link" class="link-primary">click to update</a>
</div>
<div wicket:id="comment" class="comment section"></div>
<div wicket:id="replies" class="reply section"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
index 6a02847717..16569a5785 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
@@ -373,11 +373,7 @@ public abstract class CodeCommentPanel extends Panel {
public void onClick(AjaxRequestTarget target) {
replyContainer.remove();
OneDev.getInstance(CodeCommentReplyManager.class).delete(getReply(replyId));
- String script = String.format(""
- + "$('#%s').remove();"
- + "$('#%s').closest('.ps-scroll').trigger('resized');",
- replyContainer.getMarkupId(), CodeCommentPanel.this.getMarkupId());
- target.appendJavaScript(script);
+ target.appendJavaScript(String.format("$('#%s').remove();", replyContainer.getMarkupId()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.css b/server-core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.css
index 35ed0673f2..705af9a0c7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.css
@@ -4,6 +4,7 @@
border-color: #e4e6ef;
height: calc(1.5em + 1.3rem + 2px);
padding: 0.65rem 1rem;
+ display: inline-flex;
}
.sp-replacer:hover {
border-color: #e4e6ef;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
index 0ed9d24085..abcb6d3305 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
@@ -39,7 +39,7 @@
<div wicket:id="message" class="message mr-3"></div>
<div class="labels">
<wicket:container wicket:id="labels">
- <span wicket:id="label" class="badge badge-secondary badge-sm mr-2"></span>
+ <span wicket:id="label" class="badge badge-info badge-sm mr-2"></span>
</wicket:container>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.html b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.html
index ce1fa39c8a..ee18ef5089 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.html
@@ -1,15 +1,17 @@
<wicket:panel>
- <div class="text-diff cm-s-eclipse">
- <div class="head d-flex align-items-center flex-wrap px-3 py-2 border">
- <div wicket:id="diffStat" class="mr-2"></div>
- <div wicket:id="title" class="mr-3 text-break"></div>
- <div wicket:id="actions" class="ml-auto">
- <a wicket:id="blameFile" title="Blame" class="btn btn-xs btn-icon btn-light btn-hover-secondary btn-active-primary"><wicket:svg href="commit" class="icon"/></a>
- <a wicket:id="viewFile" title="View" class="btn btn-xs btn-icon btn-light btn-hover-secondary ml-1"><wicket:svg href="eye" class="icon"/></a>
- <a wicket:id="editFile" title="Edit" class="btn btn-xs btn-icon btn-light btn-hover-secondary ml-1"><wicket:svg href="edit" class="icon"/></a>
+ <table class="text-diff cm-s-eclipse">
+ <caption class="p-0">
+ <div class="d-flex align-items-center px-3 py-2 border">
+ <div wicket:id="diffStat" class="mr-2 text-nowrap"></div>
+ <div wicket:id="title" class="mr-3 text-break"></div>
+ <div wicket:id="actions" class="ml-auto text-nowrap">
+ <a wicket:id="blameFile" title="Blame" class="btn btn-xs btn-icon btn-light btn-hover-secondary btn-active-primary"><wicket:svg href="commit" class="icon"/></a>
+ <a wicket:id="viewFile" title="View" class="btn btn-xs btn-icon btn-light btn-hover-secondary ml-1"><wicket:svg href="eye" class="icon"/></a>
+ <a wicket:id="editFile" title="Edit" class="btn btn-xs btn-icon btn-light btn-hover-secondary ml-1"><wicket:svg href="edit" class="icon"/></a>
+ </div>
</div>
- </div>
- <table class="body diff"><wicket:container wicket:id="diffLines"></wicket:container></table>
- </div>
+ </caption>
+ <wicket:container wicket:id="diffLines"></wicket:container>
+ </table>
<div wicket:id="symbolTooltip"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css
index 1ca36cbd7c..cea05bf3f0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css
@@ -1,12 +1,17 @@
-.text-diff>.head {
+.text-diff {
+ table-layout: fixed;
+ width: 100%;
+ border-collapse: separate;
+}
+.text-diff>caption {
+ caption-side: top;
+}
+.text-diff>caption>div {
border-radius: 0.42rem 0.42rem 0 0;
}
-.text-diff>.body {
+.text-diff>tbody {
font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
font-size: 0.9rem;
- table-layout: fixed;
- width: 100%;
- border-collapse: separate;
}
/*
@@ -14,108 +19,109 @@
* focusing on expander link. This relates to negative margin top
* specified for change class in revision diff panel
*/
-.text-diff>.body>tbody>tr>td {
+.text-diff>tbody>tr>td {
position: relative;
}
-.text-diff>.body>tbody>tr>td.number {
+.text-diff>tbody>tr>td.number {
padding: 0 0.3rem;
border-left: 1px solid var(--light-gray);
text-align: right;
color: var(--gray);
}
-.text-diff>.body>tbody>tr>td:last-child {
+.text-diff>tbody>tr>td:last-child {
border-right: 1px solid var(--light-gray);
}
-.text-diff>.body>tbody>tr:last-child>td:first-child {
+.text-diff>tbody>tr:last-child>td:first-child {
border-radius: 0 0 0 0.42rem;
}
-.text-diff>.body>tbody>tr:last-child>td:last-child {
+.text-diff>tbody>tr:last-child>td:last-child {
border-radius: 0 0 0.42rem 0;
}
-.text-diff>.body>tbody>tr>td.operation {
+.text-diff>tbody>tr>td.operation {
border-left: 1px solid var(--light-gray);
}
-.text-diff>.body>tbody>tr>td:FIRST-CHILD {
+.text-diff>tbody>tr>td:FIRST-CHILD {
border-left: 1px solid var(--light-gray);
}
-.text-diff>.body>tbody>tr:LAST-CHILD>td {
+.text-diff>tbody>tr:LAST-CHILD>td {
border-bottom: 1px solid var(--light-gray);
}
-.text-diff>.body>tbody>tr.expander>td.skipped {
+.text-diff>tbody>tr.expander>td.skipped {
padding: 0.5rem 1.2rem;
border-left: 1px solid var(--light-gray);
background: var(--light);
color: var(--gray);
}
-.text-diff>.body>tbody>tr.expander>td.expander {
+.text-diff>tbody>tr.expander>td.expander {
text-align: center;
overflow: hidden;
+ vertical-align: middle;
}
-.text-diff>.body>tbody>tr.expander>td.expander a {
+.text-diff>tbody>tr.expander>td.expander a {
display: block;
background: var(--light);
color: var(--gray);
padding: 2rem 0;
- margin: -2rem 0;
+ margin: -2rem -1px;
}
-.text-diff>.body>tbody>tr.expander>td.expander>a:hover,
-.text-diff>.body>tbody>tr.expander>td.expander>a:focus {
+.text-diff>tbody>tr.expander>td.expander>a:hover,
+.text-diff>tbody>tr.expander>td.expander>a:focus {
background: var(--primary);
color: white;
}
-.text-diff>.body>tbody>tr>td.old.number {
+.text-diff>tbody>tr>td.old.number {
background: #ffdddd;
border-left: 1px solid #f1c0c0;
}
-.text-diff>.body>tbody>tr>td.old.content {
+.text-diff>tbody>tr>td.old.content {
background: #ffecec;
}
-.text-diff>.body>tbody>tr>td.old.operation {
+.text-diff>tbody>tr>td.old.operation {
border-left: 1px solid #f1c0c0;
background: #ffecec;
}
-.text-diff>.body>tbody>tr>td.old .delete {
+.text-diff>tbody>tr>td.old .delete {
background-color: #F8B8B8;
text-decoration: line-through;
}
-.text-diff>.body>tbody>tr>td.new.number {
+.text-diff>tbody>tr>td.new.number {
background: #dbffdb;
border-left: 1px solid #c1e9c1;
}
-.text-diff>.body>tbody>tr>td.new.content {
+.text-diff>tbody>tr>td.new.content {
background: #eaffea;
}
-.text-diff>.body>tbody>tr>td.new.operation {
+.text-diff>tbody>tr>td.new.operation {
border-left: 1px solid #c1e9c1;
background: #eaffea;
}
-.text-diff>.body>tbody>tr>td.new .insert {
+.text-diff>tbody>tr>td.new .insert {
background-color: #94F094;
}
-.text-diff>.body>tbody>tr>td.old.new.number {
+.text-diff>tbody>tr>td.old.new.number {
background: #FAF3D0;
border-left: 1px solid #EBD049;
}
-.text-diff>.body>tbody>tr>td.old.new.content {
+.text-diff>tbody>tr>td.old.new.content {
background: #FCF8E4;
}
-.text-diff>.body>tbody>tr>td.old.new.operation {
+.text-diff>tbody>tr>td.old.new.operation {
border-left: 1px solid #EBD049;
background: #FCF8E4;
}
-.text-diff>.body>tbody>tr>td.content {
+.text-diff>tbody>tr>td.content {
white-space: pre-wrap;
word-wrap: break-word;
}
-.text-diff>.body>tbody>tr>td.operation {
+.text-diff>tbody>tr>td.operation {
font-weight: bold;
padding: 0 0.3rem 0 0.3rem;
}
-.text-diff>.body>tbody>tr:hover>td {
+.text-diff>tbody>tr:hover>td {
background: var(--light-primary) !important;
}
-.text-diff>.body>tbody>tr.code {
+.text-diff>tbody>tr.code {
background: inherit;
border: inherit;
border-radius: inherit;
@@ -124,25 +130,25 @@
font-family: inherit;
font-size: inherit;
}
-.text-diff>.body>tbody>tr>td.content>span.content-mark {
+.text-diff>tbody>tr>td.content>span.content-mark {
background: #CCCCFF;
}
-.text-diff>.body>tbody>tr>td.content>span.content-mark.insert {
+.text-diff>tbody>tr>td.content>span.content-mark.insert {
background: #88FFFF;
}
-.text-diff>.body>tbody>tr>td.content>span.content-mark.delete {
+.text-diff>tbody>tr>td.content>span.content-mark.delete {
background: #FF88FF;
}
-.text-diff>.body>tbody>tr>td.number>.comment-indicator {
+.text-diff>tbody>tr>td.number>.comment-indicator {
margin: 0 0.3rem;
color: var(--gray);
font-size: 1rem;
}
-.text-diff>.body>tbody>tr>td.number>.comment-indicator:hover {
+.text-diff>tbody>tr>td.number>.comment-indicator:hover {
color: var(--dark);
}
-.text-diff>.body>tbody>tr>td.number>.comment-indicator svg {
+.text-diff>tbody>tr>td.number>.comment-indicator svg {
margin-top: 0;
}
.comment-popover a {
@@ -154,14 +160,11 @@
.comment-popover a:hover {
color: var(--dark);
}
-.text-diff>.body>tbody>tr>td.number>.comment-trigger.active,
+.text-diff>tbody>tr>td.number>.comment-trigger.active,
.comment-popover .comment-trigger.active {
color: var(--dark);
}
-.text-diff>.body>tbody>tr>td.number>.comment-trigger.active {
- line-height: 1rem;
-}
-.text-diff>.body>tbody>tr>td.blame {
+.text-diff>tbody>tr>td.blame {
font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
text-overflow: ellipsis;
overflow: hidden;
@@ -169,21 +172,21 @@
padding: 0 0.3rem;
border-left: 1px solid var(--secondary);
}
-.text-diff>.body>tbody>tr>td.blame.abbr {
+.text-diff>tbody>tr>td.blame.abbr {
text-overflow: inherit;
}
-.text-diff>.body>tbody>tr>td.blame .hash, .text-diff>.body>tbody>tr>td.blame .date {
+.text-diff>tbody>tr>td.blame .hash, .text-diff>tbody>tr>td.blame .date {
margin-right: 0.6rem;
}
-.text-diff>.body>tbody>tr>td.blame.abbr .hash {
+.text-diff>tbody>tr>td.blame.abbr .hash {
margin-right: 0;
}
-.text-diff>.body>tbody>tr>td.blame .same-as-above {
+.text-diff>tbody>tr>td.blame .same-as-above {
margin-left: 90px;
margin-top: -0.6rem;
color: var(--gray);
font-size: 1.2rem;
}
-.text-diff>.body>tbody>tr>td.blame.abbr .same-as-above {
+.text-diff>tbody>tr>td.blame.abbr .same-as-above {
margin-left: 1rem;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js
index 172d677cfa..f366d780c4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js
@@ -470,11 +470,11 @@ onedev.server.textDiff = {
var $container = $("#" + containerId);
if (!markUrl) {
- $content = $("<div><span class='invalid'><svg class='icon'><use xlink:href='" + onedev.server.icons + "#warning'/></svg> Unable to comment here</a>");
+ $content = $("<div><span class='invalid'><svg class='icon mr-1'><use xlink:href='" + onedev.server.icons + "#warning'/></svg> Unable to comment here</a>");
} else {
- var $content = $("<div><a class='permanent'><svg class='icon'><use xlink:href='" + onedev.server.icons + "#link'/></svg> Permanent link of this selection</a>");
+ var $content = $("<div><a class='permanent'><svg class='icon mr-1'><use xlink:href='" + onedev.server.icons + "#link'/></svg> Permanent link of this selection</a>");
$content.children("a.permanent").attr("href", markUrl);
- $content.append("<a class='copy-marked'><svg class='icon'><use xlink:href='" + onedev.server.icons + "#copy'/></svg> Copy selected text to clipboard</a>");
+ $content.append("<a class='copy-marked'><svg class='icon mr-1'><use xlink:href='" + onedev.server.icons + "#copy'/></svg> Copy selected text to clipboard</a>");
var clipboard = new Clipboard(".copy-marked", {
text: function(trigger) {
return markedText;
@@ -484,7 +484,7 @@ onedev.server.textDiff = {
clipboard.destroy();
});
if (loggedIn) {
- $content.append("<a class='comment'><svg class='icon'><use xlink:href='" + onedev.server.icons + "#comment'/></svg> Add comment on this selection</a>");
+ $content.append("<a class='comment'><svg class='icon mr-1'><use xlink:href='" + onedev.server.icons + "#comment'/></svg> Add comment on this selection</a>");
$content.children("a.comment").click(function() {
if ($("#"+$container.data("dirtyContainerId")).find("form.dirty").length != 0
&& !confirm("There are unsaved changes, discard and continue?")) {
@@ -494,7 +494,8 @@ onedev.server.textDiff = {
mark.fromRow, mark.fromColumn, mark.toRow, mark.toColumn);
});
} else {
- $content.append("<span class='comment'><svg class='icon'><use xlink:href='" + onedev.server.icons + "#warning'/></svg> Login to comment on selection</span>");
+ var loginHref = $(".sign-in").attr("href");
+ $content.append("<a class='comment' href='" + loginHref + "'><svg class='icon mr-1'><use xlink:href='" + onedev.server.icons + "#warning'/></svg> Login to comment on selection</a>");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html
index 1c697d6d88..3d2e153e93 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html
+++ b/server-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="alert alert-light-warning revision-indexing">
- <wicket:svg href="loading" class="icon spin"/>
+ <div wicket:id="revisionsIndexing" class="alert alert-notice alert-light-warning revision-indexing">
+ <wicket:svg href="loading" class="icon spin mr-1"/>
Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)
</div>
<!-- disable auto focus here as otherwise we have problems jumping to marked code blocks -->
@@ -31,7 +31,7 @@
<div wicket:id="body" class="body">
<div wicket:id="feedback"></div>
<div class="title"><a wicket:id="totalFiles" class="total-files"></a></div>
- <div wicket:id="tooManyFiles" class="alert alert-light-warning">Sorry we are unable to display all files as there are too many</div>
+ <div wicket:id="tooManyFiles" class="alert alert-notice alert-light-warning">Sorry we are unable to display all files as there are too many</div>
<ul wicket:id="diffStats" class="diff-stats list-unstyled">
<li wicket:id="diffStats" class="diff-stat d-flex align-items-center flex-wrap mb-2">
<svg wicket:id="icon" class="icon mr-2"></svg>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html
index bff2d692b6..edcd8e82c2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html
@@ -9,8 +9,8 @@
<div wicket:id="addComment" class="mt-4"></div>
</div>
<wicket:fragment wicket:id="loginToCommentFrag">
- <div class="login-to-comment alert alert-light-info text-center font-size-h6">
- <a wicket:id="login">Login to comment</a>
+ <div class="login-to-comment alert alert-light text-center font-size-h6">
+ <a wicket:id="login" class="link-primary">Login to comment</a>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="addCommentFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 6f80579672..7e95c89137 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -377,7 +377,7 @@ public abstract class IssueListPanel extends Panel {
};
}
- });
+ }.add(AttributeAppender.append("class", "no-current")));
} else {
add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject())));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.html
index d46a26ae89..0ef45cad63 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <div class="alert alert-custom alert-notice alert-light-warning shadow">Issue workflow changed, <a wicket:id="reconcile" class="mx-2">reconciliation</a> needs to be performed to make data consistent</div>
+ <div class="alert alert-notice alert-light-warning shadow">Issue workflow changed, <a wicket:id="reconcile" class="link-primary">reconciliation</a> needs to be performed to make data consistent</div>
</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.html
index 7ed0f16be3..6182f91d8e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.html
@@ -7,7 +7,7 @@
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
- <div class="alert alert-light-warning">
+ <div class="alert alert-notice alert-light-warning">
Please resolve undefined states below. Note that if you select to delete an undefined state,
all issues with that state will be deleted
</div>
@@ -40,7 +40,7 @@
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
- <div class="alert alert-custom alert-notice alert-light-warning">
+ <div class="alert alert-notice alert-light-warning">
Please resolve undefined fields below
</div>
<table class="table table-condensed">
@@ -72,7 +72,7 @@
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
- <div class="alert alert-custom alert-notice alert-light-warning">
+ <div class="alert alert-notice alert-light-warning">
Please resolve undefined field values below
</div>
<table class="table table-condensed">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html
index d9a222fe3c..43ef387696 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html
@@ -32,9 +32,9 @@
<a wicket:id="splitLink" class="split" title="Split view"><wicket:svg href="split" class="icon"></wicket:svg></a>
</div>
</div>
- <div class="warning alert alert-light-warning">
+ <div class="warning alert alert-notice alert-light-warning">
<a class="close" data-dismiss="alert"><span><wicket:svg href="times" class="icon"/></span></a>
- <div class="message"><wicket:svg href="warning" class="icon"/> Below content is restored from an unsaved change</div>
+ <div class="message">Below content is restored from an unsaved change</div>
</div>
<div class="emojis"></div>
<div class="help">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
index 59a85dff5c..34bb1a0abd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
@@ -60,7 +60,7 @@ onedev.server.markdown = {
$rendered.data("caretOffset", caretOffset);
onedev.server.perfectScrollbar.empty($rendered);
- $rendered.prepend("<div class='message'>Loading...</div>");
+ $rendered.html("<div class='message'>Loading...</div>");
$editLink.removeClass("active");
$previewLink.addClass("active");
@@ -72,8 +72,7 @@ onedev.server.markdown = {
$input.focus();
- onedev.server.perfectScrollbar.empty($rendered);
- $rendered.prepend("<div class='message'>Loading...</div>");
+ $rendered.html("<div class='message'>Loading...</div>");
$editLink.removeClass("active");
$previewLink.removeClass("active");
@@ -782,8 +781,7 @@ onedev.server.markdown = {
existingImages[key] = elements;
});
- onedev.server.perfectScrollbar.empty($rendered);
- $rendered.prepend(html);
+ $rendered.html(html);
onedev.server.markdown.initRendered($rendered);
@@ -869,10 +867,8 @@ onedev.server.markdown = {
var content = $rendered.data("content");
- if (content) {
- onedev.server.perfectScrollbar.empty($rendered);
- $rendered.prepend(content).removeData("content");
- }
+ if (content)
+ $rendered.html(content).removeData("content");
if (taskCallback) {
var $task = $container.find(".task-list-item");
@@ -986,8 +982,7 @@ onedev.server.markdown = {
var emoji = emojis[i];
contentHtml += "<a class='emoji' title='" + emoji.name + "'><img src='" + emoji.url + "'></img></a> ";
}
- onedev.server.perfectScrollbar.empty($emojis);
- $emojis.prepend(contentHtml);
+ $emojis.html(contentHtml);
$emojis.removeClass("loading");
$emojis.addClass("loaded");
$emojis.find(".emoji").click(function() {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardSupportPanel.html b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardSupportPanel.html
index 54cbb3cc08..4f0c65f6f1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardSupportPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardSupportPanel.html
@@ -10,7 +10,7 @@
<!-- perfect scrollbar is installed to body tag, so we attach user
supplied body one level down, to make sure that the body tag will never
be updated-->
- <div class="card-body h-100 ps ps-scroll"><div wicket:id="body"></div></div>
+ <div class="card-body h-100 overflow-auto"><div wicket:id="body"></div></div>
<div wicket:id="footer" class="card-footer"></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/orderedit/OrderEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/orderedit/OrderEditPanel.java
index 954d6f71dd..aa1e2583cf 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/orderedit/OrderEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/orderedit/OrderEditPanel.java
@@ -38,7 +38,7 @@ public class OrderEditPanel extends GenericPanel<List<EntitySort>> {
protected void onInitialize() {
super.onInitialize();
- getParent().add(AttributeAppender.append("class", "order-edit ps ps-scroll"));
+ getParent().add(AttributeAppender.append("class", "order-edit"));
WebMarkupContainer selectedContainer = new WebMarkupContainer("selected") {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.html
index a459ddef47..15c6e46d12 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.html
@@ -9,7 +9,7 @@
</div>
</div>
<div class="card-body">
- <div wicket:id="noSshKeysWarning" class="alert alert-light-warning mb-4">
+ <div wicket:id="noSshKeysWarning" class="alert alert-notice alert-light-warning mb-4">
No SSH keys configured in your account. You may <a wicket:id="sshKeys" class="link-primary">add a key</a> or switch to <a wicket:id="useHttp" class="link-primary">HTTP(S)</a> url
</div>
<div wicket:id="content"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html
index e5e6629268..a96e9e2809 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html
@@ -13,6 +13,6 @@
</a>
</li>
</ul>
- <div wicket:id="noProjects" class="no-projects alert alert-light-warning mb-0 mt-4">No Projects Found</div>
+ <div wicket:id="noProjects" class="no-projects alert alert-notice alert-light-warning mb-0 mt-4">No Projects Found</div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.css b/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.css
index 062be91256..f4bacb7e7d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.css
@@ -11,4 +11,7 @@
}
.project-selector .project>a.current>.icon {
visibility: visible;
+}
+.no-current .project-selector .project>a>.icon {
+ display: none;
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.html
index f039ee0250..e46143ef99 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.html
@@ -1,19 +1,13 @@
<wicket:panel>
- <table class="assignments">
- <tr wicket:id="assignments">
- <td class="user float-left">
- <a wicket:id="user"></a>
- </td>
- <td class="actions">
- <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger" title="Remove this assignee"><wicket:svg href="trash" class="icon"></wicket:svg></a>
- </td>
- </tr>
+ <ul class="assignments list-unstyled mb-0">
+ <li wicket:id="assignments" class="d-flex align-items-center flex-nowrap">
+ <a wicket:id="user" class="mr-3"></a>
+ <a wicket:id="delete" class="delete btn btn-icon btn-xs btn-light btn-hover-danger flex-shrink-0" title="Remove this assignee"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ </li>
<wicket:enclosure>
- <tr class="add-assignee">
- <td colspan="2">
- <input wicket:id="addAssignee" type="hidden" class="form-control">
- </td>
- </tr>
+ <li class="add-assignee">
+ <input wicket:id="addAssignee" type="hidden" class="form-control">
+ </li>
</wicket:enclosure>
- </table>
+ </ul>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/assignment-list.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/assignment-list.css
index daf1b90973..9bb10d4477 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/assignment-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/assignment-list.css
@@ -1,19 +1,3 @@
-table.assignments>tbody>tr>td {
- padding: 0.5rem 1rem;
- vertical-align: middle;
-}
-table.assignments>tbody>tr>td:first-child {
- padding-left: 0;
-}
-table.assignments>tbody>tr>td:last-child {
- padding-right: 0;
-}
-table.assignments>tbody>tr:first-child>td {
- padding-top: 0;
-}
-table.assignments>tbody>tr:last-child>td {
- padding-bottom: 0;
-}
-table.assignments>tbody>tr>td.actions {
- text-align: right;
+.assignments>li+li {
+ padding-top: 1rem;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index b567551388..564445a496 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -345,7 +345,7 @@ public abstract class PullRequestListPanel extends Panel {
setResponsePage(NewPullRequestPage.class, NewPullRequestPage.paramsOf(project));
}
- };
+ }.add(AttributeAppender.append("class", "no-current"));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.html
index 9fef34bf68..001f29fcdf 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.html
@@ -1,24 +1,14 @@
<wicket:panel>
- <table class="reviews">
- <tr wicket:id="reviews">
- <wicket:enclosure>
- <td class="status">
- <span wicket:id="status"></span>
- </td>
- </wicket:enclosure>
- <td class="user">
- <a wicket:id="user"></a>
- </td>
- <td class="actions">
- <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Remove this reviewer"><wicket:svg href="trash" class="icon"></wicket:svg></a>
- </td>
- </tr>
+ <ul class="reviews list-unstyled mb-0">
+ <li wicket:id="reviews" class="d-flex flex-nowrap align-items-center">
+ <span wicket:id="status" class="status mr-2"></span>
+ <a wicket:id="user" class="user mr-3"></a>
+ <a wicket:id="delete" class="delete btn btn-xs btn-icon btn-light btn-hover-danger flex-shrink-0" title="Remove this reviewer"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ </li>
<wicket:enclosure child="addReviewer">
- <tr>
- <td class="add-reviewer" colspan="3">
- <input wicket:id="addReviewer" type="hidden" class="form-control">
- </td>
- </tr>
+ <li class="add-reviewer">
+ <input wicket:id="addReviewer" type="hidden" class="form-control">
+ </li>
</wicket:enclosure>
- </table>
+ </ul>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.css
index d29de68f96..81c4d36210 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.css
@@ -1,33 +1,6 @@
-table.reviews>tbody>tr>td {
- padding: 0.5rem 1rem;
- vertical-align: middle;
+.reviews>li+li {
+ margin-top: 1rem;
}
-table.reviews>tbody>tr>td.status {
- width: 1.2rem;
- padding-right: 0;
-}
-table.reviews>tbody>tr>td.status .icon {
- margin: 0;
-}
-table.reviews>tbody>tr>td:first-child {
- padding-left: 0;
-}
-table.reviews>tbody>tr>td:last-child {
- padding-right: 0;
-}
-table.reviews>tbody>tr:first-child>td {
- padding-top: 0;
-}
-table.reviews>tbody>tr:last-child>td {
- padding-bottom: 0;
-}
-table.reviews>tbody>tr>td.actions {
- text-align: right;
-}
-table.reviews>tbody>tr>td.status span {
- cursor: default;
-}
-
.reviewer-avatar {
position: relative;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.html b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.html
index 7d0390b07a..5de8b1ee23 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.html
@@ -10,7 +10,7 @@
<li wicket:id="items" class="selectable">
<a wicket:id="link" class="d-flex align-items-center"><svg wicket:id="icon" class="icon mr-2"></svg><span wicket:id="label" class="text-nowrap"></span></a>
</li>
- <li wicket:id="noItems" class="alert alert-light-warning mb-0"></li>
+ <li wicket:id="noItems" class="alert alert-notice alert-light-warning mb-0"></li>
</ul>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/SelectToAddChoice.java b/server-core/src/main/java/io/onedev/server/web/component/select2/SelectToAddChoice.java
index b2c078eeee..87b8b523d6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/select2/SelectToAddChoice.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/SelectToAddChoice.java
@@ -1,7 +1,6 @@
package io.onedev.server.web.component.select2;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
@SuppressWarnings("serial")
@@ -41,20 +40,6 @@ public abstract class SelectToAddChoice<T> extends Select2Choice<T> {
super.onInitialize();
setOutputMarkupId(true);
-
- add(new AjaxFormComponentUpdatingBehavior("change") {
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- if (selection != null) {
- onSelect(target, selection);
- selection = null;
- }
- String script = String.format("setTimeout(function(){$('#%s').select2('data', null);}, 0);", getMarkupId());
- target.appendJavaScript(script);
- }
-
- });
}
protected abstract void onSelect(AjaxRequestTarget target, T selection);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2-bootstrap.css b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2-bootstrap.css
index 66b039696e..1605d47b3c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2-bootstrap.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2-bootstrap.css
@@ -87,7 +87,7 @@
}
.select2-container-multi .select2-choices .select2-search-field input {
- height: calc(1.5em + 1.3rem + 2px);
+ height: calc(1.5em + 1.3rem);
line-height: 1.42857;
}
@@ -283,6 +283,12 @@
.select2-drop.select2-drop-above.select2-drop-active {
border-top-color: #66afe9;
}
+.is-invalid .select2-drop-auto-width,
+.is-invalid .select2-drop.select2-drop-above.select2-drop-active,
+.is-invalid.select2-drop-auto-width,
+.is-invalid.select2-drop.select2-drop-above.select2-drop-active {
+ border-top-color: #dc3545;
+}
/**
* Select2 widgets in Bootstrap Input Groups
@@ -320,6 +326,8 @@
.select2-dropdown-open.select2-drop-above [class^="select2-choice"] {
border-top-right-radius: 0 !important;
border-top-left-radius: 0 !important;
+ border-bottom-right-radius: 0.42rem !important;
+ border-bottom-left-radius: 0.42rem !important;
}
/**
@@ -441,3 +449,11 @@
background-position: right 4px center;
/* 5 */
}
+
+.select2-container.form-control.select2-drop-above .select2-choice {
+ border-bottom-color: #80bdff;
+}
+.is-invalid .select2-container.form-control.select2-drop-above .select2-choice,
+.is-invalid.select2-container.form-control.select2-drop-above .select2-choice {
+ border-bottom-color: #dc3545;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.css b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.css
index 922923734a..f9302489f9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.css
@@ -40,9 +40,9 @@ Version: 3.3.2 Timestamp: Mon Mar 25 12:14:18 PDT 2013
color: #444;
text-decoration: none;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
+ -webkit-border-radius: 0.42rem;
+ -moz-border-radius: 0.42rem;
+ border-radius: 0.42rem;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
@@ -68,9 +68,9 @@ Version: 3.3.2 Timestamp: Mon Mar 25 12:14:18 PDT 2013
.select2-container.select2-drop-above .select2-choice {
border-bottom-color: #aaa;
- -webkit-border-radius:0 0 4px 4px;
- -moz-border-radius:0 0 4px 4px;
- border-radius:0 0 4px 4px;
+ -webkit-border-radius:0 0 0.42rem 0.42rem;
+ -moz-border-radius:0 0 0.42rem 0.42rem;
+ border-radius:0 0 0.42rem 0.42rem;
background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.9, white));
background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 90%);
@@ -138,9 +138,9 @@ Version: 3.3.2 Timestamp: Mon Mar 25 12:14:18 PDT 2013
border: 1px solid #aaa;
border-top: 0;
- -webkit-border-radius: 0 0 4px 4px;
- -moz-border-radius: 0 0 4px 4px;
- border-radius: 0 0 4px 4px;
+ -webkit-border-radius: 0 0 0.42rem 0.42rem;
+ -moz-border-radius: 0 0 0.42rem 0.42rem;
+ border-radius: 0 0 0.42rem 0.42rem;
}
.select2-drop.select2-drop-above {
@@ -148,9 +148,9 @@ Version: 3.3.2 Timestamp: Mon Mar 25 12:14:18 PDT 2013
border-top: 1px solid #aaa;
border-bottom: 0;
- -webkit-border-radius: 4px 4px 0 0;
- -moz-border-radius: 4px 4px 0 0;
- border-radius: 4px 4px 0 0;
+ -webkit-border-radius: 0.42rem 0.42rem 0 0;
+ -moz-border-radius: 0.42rem 0.42rem 0 0;
+ border-radius: 0.42rem 0.42rem 0 0;
}
.select2-container .select2-choice div {
@@ -162,9 +162,9 @@ Version: 3.3.2 Timestamp: Mon Mar 25 12:14:18 PDT 2013
top: 0;
border-left: 1px solid #aaa;
- -webkit-border-radius: 0 4px 4px 0;
- -moz-border-radius: 0 4px 4px 0;
- border-radius: 0 4px 4px 0;
+ -webkit-border-radius: 0 0.42rem 0.42rem 0;
+ -moz-border-radius: 0 0.42rem 0.42rem 0;
+ border-radius: 0 0.42rem 0.42rem 0;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.js b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.js
index af0c211273..16e585f759 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.js
@@ -1036,6 +1036,7 @@ the specific language governing permissions and limitations under the Apache Lic
}, evaluate(this.opts.dropdownCss));
this.dropdown.css(css);
+ this.dropdown.css("width", this.container.outerWidth(false));
},
// abstract
@@ -1077,6 +1078,7 @@ the specific language governing permissions and limitations under the Apache Lic
*/
// abstract
opening: function() {
+ $(":focus").blur();
var cid = this.containerId,
scroll = "scroll." + cid,
resize = "resize."+cid,
diff --git a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java
index 5be6a5029e..f08de62bc5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java
@@ -54,7 +54,7 @@ public class StringChoiceProvider extends ChoiceProvider<String> {
if (StringUtils.isNotBlank(term)) {
matched = new ArrayList<>();
for (Map.Entry<String, String> entry: choicesModel.getObject().entrySet()) {
- if (entry.getValue().toLowerCase().contains(term))
+ if (entry.getValue().toLowerCase().contains(term.toLowerCase()))
matched.add(entry.getKey());
}
} else {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.css b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.css
index d5653ee04d..e40e570b08 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.css
@@ -6,7 +6,7 @@
font-size: 12px;
padding: 1rem;
z-index: 10000;
- box-shadow: 0px 10px 30px 0px rgba(82, 63, 105, 0.08);
+ box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.1);
max-width: 720px;
}
.symbol-tooltip ul.declarations li {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.js b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.js
index 518edf7361..afde82ebb9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.js
@@ -53,12 +53,11 @@ onedev.server.symboltooltip = {
onedev.server.symboltooltip.removeTooltip(container);
}
- var $tooltip = $("<div class='symbol-tooltip ps ps-scroll' id='" + containerId
+ var $tooltip = $("<div class='symbol-tooltip overflow-auto' id='" + containerId
+ "-symbol-tooltip'><img src=" + ajaxIndicatorUrl + "></img></div>");
container.tooltip = $tooltip[0];
container.tooltip.symbolEl = symbolEl;
document.body.appendChild(container.tooltip);
- $tooltip.data("ps", new PerfectScrollbar(container.tooltip));
$tooltip.mouseover(function() {
cancelHide();
@@ -83,10 +82,8 @@ onedev.server.symboltooltip = {
var $content = $("#" + contentId);
var $container = $content.parent();
var $tooltip = $("#" + $container.attr("id") + "-symbol-tooltip");
- if ($tooltip.length != 0) {
- onedev.server.perfectScrollbar.empty($tooltip);
- $tooltip.prepend($content.children()).align($tooltip.data("alignment")).data("ps").update();
- }
+ if ($tooltip.length != 0)
+ $tooltip.html($content.children()).align($tooltip.data("alignment"));
},
// this is public API which can be called from other components using this component
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.css b/server-core/src/main/java/io/onedev/server/web/editable/editable.css
index 3707d8874b..74f9bccfc9 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.css
+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.css
@@ -113,6 +113,6 @@
margin: 0.8rem 0;
}
-.bean-editor .select2-container {
+.property-editor .select2-container {
width: 100%;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css b/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css
index 54481df4c9..07c01275c7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css
@@ -1,3 +1,8 @@
.ssh-setting textarea {
font-family: monospace;
}
+
+.user-authorizations .bean-list td.property-projectName,
+.group-authorizations .bean-list td.property-projectName {
+ width: 50%;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.html
index 3b13c9c4b3..d17695c3fd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <form wicket:id="form" class="authorization-list leave-confirm">
+ <form wicket:id="form" class="group-authorizations leave-confirm">
<div wicket:id="feedback"></div>
<div wicket:id="editor"></div>
<input type="submit" class="btn btn-primary dirty-aware mt-4" value="Save">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.html
index be35a07064..9974e875e6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
<div class="issue-fields">
- <div class="text-muted text-light-info mb-4">
+ <div class="text-muted mb-4">
<wicket:svg href="bulb" class="icon"/> Define all custom issue fields here. Each project can
decide to use all or a subset of these fields via its issue transition setting.
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.html
index c79c368e28..1736ea2735 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
<div class="job-executors">
- <div class="alert alert-custom alert-notice bg-white shadow mb-5">
+ <div class="alert alert-notice bg-white shadow mb-5">
<wicket:svg href="bulb" class="icon mr-2"></wicket:svg>
For a given build job, the first matching executor will be used
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html
index 4b561e57d8..bc9dc06c39 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html
@@ -1,8 +1,8 @@
<wicket:extend>
<wicket:container wicket:id="content"></wicket:container>
<wicket:fragment wicket:id="ownerFrag">
- <div class="alert alert-custom alert-notice bg-white shadow">
- <b class="mr-2">Owner</b> is a built-in role with full permission over projects
+ <div class="alert alert-notice bg-white shadow">
+ <b>Owner</b> is a built-in role with full permission over projects
</div>
</wicket:fragment>
<wicket:fragment wicket:id="nonOwnerFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.html
index 7b36e970a5..06fbe9cd00 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div wicket:id="warning" class="alert alert-custom alert-notice alert-light-warning shadow mb-4"></div>
+ <div wicket:id="warning" class="alert alert-notice alert-light-warning shadow mb-4"></div>
<div class="card server-log">
<div class="card-body">
<a wicket:id="download" class="btn btn-light btn-hover-primary btn-block mb-4" title="Download log"><wicket:svg href="download" class="icon mr-2"/> Download</a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.html
index 1fbc80499e..1e54bce4f8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <form wicket:id="form" class="authorization-list leave-confirm">
+ <form wicket:id="form" class="user-authorizations leave-confirm">
<div wicket:id="feedback" class="mb-4"></div>
<div wicket:id="editor"></div>
<input type="submit" class="btn btn-primary dirty-aware mt-4" value="Save">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.html
index 3be64e0833..b44e1d12ae 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.html
@@ -1,7 +1,7 @@
<wicket:extend>
<div class="membership-list">
<div class="head">
- <div wicket:id="externalManagedNote" class="alert alert-light-info mb-4"></div>
+ <div wicket:id="externalManagedNote" class="alert alert-notice alert-light-warning mb-4"></div>
<div class="d-flex align-items-center flex-wrap">
<div class="clearable-wrapper mr-3 mb-4">
<input wicket:id="filterGroups" class="form-control search" placeholder="Filter by name...">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.java
index 35ab8d80d7..59e2d6fa40 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.java
@@ -29,7 +29,7 @@ public class UserPasswordPage extends UserPage {
message = "The user is currently authenticated via external system, "
+ "please change password there instead";
}
- add(new Label("content", message).add(AttributeAppender.append("class", "alert alert-light-warning alert-custom alert-notice mb-0")));
+ add(new Label("content", message).add(AttributeAppender.append("class", "alert alert-light-warning alert-notice mb-0")));
} else {
add(new PasswordEditPanel("content", userModel));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/profile/UserProfilePage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/profile/UserProfilePage.html
index 6fe7d7f7fd..4304944655 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/profile/UserProfilePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/profile/UserProfilePage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div wicket:id="externalManagedNote" class="alert alert-custom alert-notice alert-light-warning"></div>
+ <div wicket:id="externalManagedNote" class="alert alert-notice alert-light-warning"></div>
<div wicket:id="content"></div>
<a wicket:id="delete" class="btn btn-danger">Delete</a>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.html
index 4835fe2668..94cdb8830c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.html
@@ -1,7 +1,7 @@
<wicket:extend>
<div class="user-ssh-key-list list">
<div class="head">
- <div wicket:id="sshKeyNote" class="alert alert-light-info mb-4"></div>
+ <div wicket:id="sshKeyNote" class="alert alert-notice alert-light-warning mb-4"></div>
<a class="add-new btn-icon btn btn-primary" title="Add SSH key" wicket:id="newKey"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
<div class="body">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
index 260e30c441..cfcdbd73ad 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -557,3 +557,7 @@ table.norecords tfoot td>div {
.form-text a:hover, .form-text a:focus {
color: #0073e9 !important;
}
+
+.fit-content {
+ min-height: fit-content;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
index e09fa7a2d6..e400166ee2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
@@ -9,7 +9,7 @@ String.prototype.escapeHtml = function() {
.replace(/>/g, "&gt;")
.replace(/"/g, "&quot;")
.replace(/'/g, "&#039;");
- };
+};
onedev.server = {
day: {
@@ -257,22 +257,26 @@ onedev.server = {
setTimeout(function() {
// do not use :visible selector directly for performance reason
var focusibleSelector = "input[type=text], input[type=password], input:not([type]), textarea, .CodeMirror";
- var inErrorSelector = ".is-invalid";
- var $inError = $containers.find(inErrorSelector).addBack(inErrorSelector).filter(":visible:first");
- if ($inError.length == 0) {
- inErrorSelector = ".feedbackPanelERROR";
- $inError = $containers.find(inErrorSelector).addBack(inErrorSelector).filter(":visible:first");
+ var attentionSelector = ".is-invalid";
+ var $attention = $containers.find(attentionSelector).addBack(attentionSelector).filter(":visible:first");
+ if ($attention.length == 0) {
+ attentionSelector = ".feedbackPanelERROR";
+ $attention = $containers.find(attentionSelector).addBack(attentionSelector).filter(":visible:first");
+ }
+ if ($attention.length == 0) {
+ attentionSelector = ".feedbackPanelWARNING";
+ $attention = $containers.find(attentionSelector).addBack(attentionSelector).filter(":visible:first");
}
- if ($inError.length != 0) {
- var $focusable = $inError.find(focusibleSelector).addBack(focusibleSelector).filter(":visible");
+ if ($attention.length != 0) {
+ var $focusable = $attention.find(focusibleSelector).addBack(focusibleSelector).filter(":visible");
if ($focusable.hasClass("CodeMirror") && $focusable[0].CodeMirror.options.readOnly == false) {
$focusable[0].CodeMirror.focus();
} else if ($focusable.length != 0 && !$focusable.hasClass("select2-input")
&& $focusable.closest(".no-autofocus").length == 0) {
$focusable.focus();
} else {
- $inError[0].scrollIntoView({behavior: "smooth", block: "center"});
+ $attention[0].scrollIntoView({behavior: "smooth", block: "center"});
}
} else {
$containers.find(focusibleSelector).addBack(focusibleSelector).filter(":visible").each(function() {
@@ -289,7 +293,7 @@ onedev.server = {
}
});
}
- }, 0);
+ }, 100);
},
setupAutoFocus: function() {
@@ -753,9 +757,16 @@ onedev.server = {
$(window).resize(function() {
var $autofit = $(".autofit:visible:not(:has('.autofit:visible'))");
- // Do not use parents(":not('html'):not('body')") here as it will select $autofit self in
- // safari. Very odd
- $autofit.css("overflow", "auto").parents().not("html").not("body").css("overflow", "hidden");
+ /*
+ * 1. Do not use parents(":not('html'):not('body')") here as it will select $autofit self in
+ * safari. Very odd
+ * 2. We remove fit-content class from parents of autofit as otherwise dimension calculation
+ * of elements embedded inside it will be based on content instead of viewport, and this
+ * causes issues when view/edit code in a autofit container. Note that removing fit-content
+ * will not break safari in this case as only the innermost autofit can have scrollbars
+ */
+ $autofit.css("overflow", "auto").parents().not("html").not("body")
+ .css("overflow", "hidden").removeClass("fit-content");
$(document).find(".resize-aware").trigger("resized");
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
index 0094a95b11..3cd94cba62 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
@@ -41,7 +41,7 @@
<a href="https://github.com/theonedev/onedev" class="github topbar-link d-none d-sm-inline" target="_blank">
<wicket:svg href="github" class="icon"></wicket:svg>
</a>
- <a wicket:id="signIn" class="topbar-link"><wicket:svg href="login" class="icon"/> <span class="d-none d-sm-inline">Sign In</span></a>
+ <a wicket:id="signIn" class="topbar-link sign-in"><wicket:svg href="login" class="icon"/> <span class="d-none d-sm-inline">Sign In</span></a>
<div wicket:id="userInfo" class="dropdown user-info">
<a href="#" class="dropdown-toggle user-info no-dropdown-caret topbar-link" data-toggle="dropdown">
<img wicket:id="avatar">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java
index 8b0fe275f1..b34ff810cf 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java
@@ -31,7 +31,7 @@ public class MyPasswordPage extends MyPage {
message = "You are currently authenticated via external system, "
+ "please change password there instead";
}
- add(new Label("content", message).add(AttributeAppender.append("class", "alert alert-light-warning alert-custom alert-notice mb-0")));
+ add(new Label("content", message).add(AttributeAppender.append("class", "alert alert-light-warning alert-notice mb-0")));
} else {
add(new PasswordEditPanel("content", new AbstractReadOnlyModel<User>() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html
index 3b6a75933d..d272b07a4e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html
@@ -1,7 +1,7 @@
<wicket:extend>
<div class="card">
<div class="card-body">
- <div wicket:id="externalManagedNote" class="alert alert-custom alert-notice alert-light-warning"></div>
+ <div wicket:id="externalManagedNote" class="alert alert-notice alert-light-warning"></div>
<div wicket:id="content"></div>
<a wicket:id="delete" class="btn btn-danger">Delete</a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html
index 9541ec7f0d..42a3a90d00 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
<div class="p-5">
- <div wicket:id="sshKeyNote" class="alert alert-custom alert-notice alert-light-warning mb-5"></div>
+ <div wicket:id="sshKeyNote" class="alert alert-notice alert-light-warning mb-5"></div>
<div class="card">
<div class="card-body">
<a wicket:id="newKey" class="btn btn-primary btn-icon mb-4" title="Add SSH Key"><wicket:svg href="plus" class="icon"></wicket:svg></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html
index 8c8dfea1cc..8c584c3689 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html
@@ -1,5 +1,9 @@
<wicket:extend>
- <div class="project flex-grow-1 d-flex flex-column">
+ <!-- fit-content is added here to fix the issue that the project div can not
+ cover its content if content is too long to cause scroll bars to apear in parent
+ div. This happens in safari only
+ -->
+ <div class="project flex-grow-1 d-flex flex-column fit-content">
<wicket:child></wicket:child>
</div>
<wicket:fragment wicket:id="topbarTitleFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
index 9c268863b2..dbfa0bd11f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
@@ -19,7 +19,7 @@
</div>
<div wicket:id="buildSupportNote" class="build-support-note p-3 text-info flex-shrink-0">
<wicket:svg href="bulb" class="icon"/>
- Enable build support by <a wicket:id="addFile"></a>
+ Enable build support by <a wicket:id="addFile" class="link-primary"></a>
</div>
<div wicket:id="blobContent" class="blob-content autofit flex-grow-1 d-flex flex-column"></div>
<div wicket:id="searchResult" class="search-result flex-shrink-0 flex-column overflow-hidden">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html
index 49ecf28dc4..96111b8865 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html
@@ -4,10 +4,7 @@
<div class="body">
<form wicket:id="form">
<div wicket:id="feedback"></div>
- <div wicket:id="changed" class="changed">
- <div class="alert alert-light-warning">Someone made below change since you started editing</div>
- <div wicket:id="changes" class="changes"></div>
- </div>
+ <div wicket:id="changesOfOthers" class="mb-4"></div>
<div wicket:id="commitMessage" class="no-autosize mb-4"></div>
<input wicket:id="save" type="submit" class="btn btn-primary mr-1" value="Commit">
<input wicket:id="cancel" type="button" class="btn btn-secondary" value="Cancel">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
index f117b1fa5b..c405ab9640 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
@@ -10,6 +10,7 @@ import java.util.Set;
import javax.annotation.Nullable;
import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
@@ -75,7 +76,7 @@ public abstract class CommitOptionPanel extends Panel {
private CommitMessageBean commitMessageBean = new CommitMessageBean();
- private BlobChange change;
+ private BlobChange changesOfOthers;
private boolean contentModified;
@@ -140,31 +141,30 @@ public abstract class CommitOptionPanel extends Panel {
}
- private void newChangedContainer(@Nullable AjaxRequestTarget target) {
- WebMarkupContainer changedContainer = new WebMarkupContainer("changed");
- changedContainer.setVisible(change != null);
- if (change != null) {
- changedContainer.add(new BlobDiffPanel("changes", new AbstractReadOnlyModel<Project>() {
+ private void newChangesOfOthersContainer(@Nullable AjaxRequestTarget target) {
+ Component changesOfOthersContainer;
+ if (changesOfOthers != null) {
+ changesOfOthersContainer = new BlobDiffPanel("changesOfOthers", new AbstractReadOnlyModel<Project>() {
@Override
public Project getObject() {
return context.getProject();
}
- }, new Model<PullRequest>(null), change, DiffViewMode.UNIFIED, null, null));
+ }, new Model<PullRequest>(null), changesOfOthers, DiffViewMode.UNIFIED, null, null);
} else {
- changedContainer.add(new WebMarkupContainer("changes"));
+ changesOfOthersContainer = new WebMarkupContainer("changesOfOthers").setVisible(false);
}
if (target != null) {
- form.replace(changedContainer);
+ form.replace(changesOfOthersContainer);
target.add(form);
- if (change != null) {
+ if (changesOfOthers != null) {
String script = String.format("$('#%s .commit-option input[type=submit]').val('Commit and overwrite');",
getMarkupId());
target.appendJavaScript(script);
}
} else {
- form.add(changedContainer);
+ form.add(changesOfOthersContainer);
}
}
@@ -177,7 +177,7 @@ public abstract class CommitOptionPanel extends Panel {
add(form);
form.add(new FencedFeedbackPanel("feedback", form));
- newChangedContainer(null);
+ newChangesOfOthersContainer(null);
commitMessageBean.setSummary(getDefaultCommitMessage());
form.add(BeanContext.edit("commitMessage", commitMessageBean));
@@ -252,7 +252,7 @@ public abstract class CommitOptionPanel extends Panel {
}
private boolean save(AjaxRequestTarget target, @Nullable String position) {
- change = null;
+ changesOfOthers = null;
if (newContentProvider != null && StringUtils.isBlank(context.getNewPath())) {
form.error("Please specify file name.");
@@ -340,13 +340,15 @@ public abstract class CommitOptionPanel extends Panel {
if (treeWalk.getObjectId(1).equals(ObjectId.zeroId())) {
if (newContentProvider != null) {
oldPaths.clear();
- change = getChange(treeWalk, lastPrevCommit, prevCommit);
+ changesOfOthers = getChange(treeWalk, lastPrevCommit, prevCommit);
+ form.warn("Someone made below change since you started editing");
break;
} else {
newCommitId = e.getOldCommitId();
}
} else {
- change = getChange(treeWalk, lastPrevCommit, prevCommit);
+ changesOfOthers = getChange(treeWalk, lastPrevCommit, prevCommit);
+ form.warn("Someone made below change since you started editing");
break;
}
}
@@ -364,7 +366,7 @@ public abstract class CommitOptionPanel extends Panel {
target.appendJavaScript("$(window).resize();");
return true;
} else {
- newChangedContainer(target);
+ newChangesOfOthersContainer(target);
return false;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.css
index 05ede9853d..01d2b9f6f7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.css
@@ -1,6 +1,3 @@
-.commit-option>.body .changed>.changes {
- margin-bottom: 20px;
-}
.commit-option>.body .text-diff>.head>.actions {
display: none;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
index 1f71784f13..62cd6e7b7a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
@@ -72,17 +72,17 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
validFrag.add(hasJobsFrag);
} else {
- validFrag.add(new Label("jobs", "No jobs defined").add(AttributeAppender.append("class", "not-defined alert alert-light-warning font-weight-bold d-flex d-none")));
+ validFrag.add(new Label("jobs", "No jobs defined").add(AttributeAppender.append("class", "not-defined alert alert-notice alert-light-warning d-flex d-none")));
}
if (!buildSpec.getProperties().isEmpty())
validFrag.add(PropertyContext.view("properties", buildSpec, "properties"));
else
- validFrag.add(new Label("properties", "No properties defined").add(AttributeAppender.append("class", "not-defined alert alert-light-warning font-weight-bold d-flex d-none")));
+ validFrag.add(new Label("properties", "No properties defined").add(AttributeAppender.append("class", "not-defined alert alert-notice alert-light-warning d-flex d-none")));
add(validFrag);
} else {
- add(new Label("content", "Build spec not defined").add(AttributeAppender.append("class", "not-defined m-4 alert alert-light-warning font-weight-bold")));
+ add(new Label("content", "Build spec not defined").add(AttributeAppender.append("class", "not-defined m-4 alert alert-notice alert-light-warning")));
}
} catch (Exception e) {
Fragment invalidFrag = new Fragment("content", "invalidFrag", this);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.html
index 359e5627cd..64d8bcb76c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div class="alert alert-light-warning m-4 d-flex align-items-center">
- <wicket:svg href="warning" class="icon mr-2"/> Unable to show content
+ <div class="alert alert-notice alert-light-warning m-4">
+ Unable to show content
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html
index 5789357f8a..98500f3418 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html
@@ -12,7 +12,7 @@
</td>
<td wicket:id="lastCommit" class="last-commit author"></td>
<td class="last-commit message d-none d-lg-table-cell"></td>
- <td class="last-commit when text-gray d-none d-lg-table-cell"></td>
+ <td class="last-commit when text-gray d-none d-xl-table-cell"></td>
</tr>
</table>
<div wicket:id="readme" class="readme">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java
index f8f38fea9e..704fd5b14d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java
@@ -220,7 +220,7 @@ public class FolderViewPanel extends Panel {
item.add(pathLink);
if (item.getIndex() == 0)
- item.add(new Label("lastCommit", "Loading last commit info..."));
+ item.add(new Label("lastCommit", "<span class='text-warning'>Loading last commit info...</span>").setEscapeModelStrings(false));
else
item.add(new Label("lastCommit"));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.html
index 33433df9b7..01b494694a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.html
@@ -1,5 +1,5 @@
<wicket:panel>
- <div class="no-name alert alert-custom alert-notice alert-light-warning">
+ <div class="no-name alert alert-notice alert-light-warning">
Please specify file name above before editing content
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.html
index edc8780bbb..c41b88627f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.html
@@ -2,9 +2,9 @@
<!-- Make it no-autofocus as we will do focus with CodeMirror. Also this is necessary to fix the issue that
file name input loses focus when add file via firefox in Linux -->
<div class="source-edit blob-submit-aware no-autofocus d-flex flex-grow-1 flex-column">
- <div class="m-3 warning alert alert-light-warning d-shrink-0">
+ <div class="m-3 warning alert-notice alert alert-light-warning d-shrink-0">
<button class="close" data-dismiss="alert"><span><wicket:svg href="times" class="icon"/></span></button>
- <div class="message"><wicket:svg href="warning" class="icon"/> Below content is restored from an unsaved change</div>
+ <div class="message">Below content is restored from an unsaved change</div>
</div>
<div class="code flex-grow-1 autofit overflow-hidden resize-aware"></div>
<textarea wicket:id="input" class="input d-none"></textarea>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html
index b18c7f6ff3..707409a7d4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html
@@ -35,7 +35,7 @@
</div>
<div class="modal-body">
<input wicket:id="input" class="form-control">
- <div wicket:id="result" class="result ps ps-scroll mt-3"></div>
+ <div wicket:id="result" class="result overflow-auto mt-3"></div>
</div>
</div>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js
index 6033d65ea4..94edb351ee 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js
@@ -319,7 +319,8 @@ onedev.server.sourceView = {
callback("addComment", mark.fromRow, mark.fromColumn, mark.toRow, mark.toColumn);
});
} else {
- $content.append("<span class='comment'><svg class='icon mr-1'><use xlink:href='" + onedev.server.icons + "#warning'/></svg> Login to comment on selection</span>");
+ var loginHref = $(".sign-in").attr("href");
+ $content.append("<a href='" + loginHref + "' class='comment'><svg class='icon mr-1'><use xlink:href='" + onedev.server.icons + "#warning'/></svg> Login to comment on selection</a>");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.html
index c2e72a2ef0..2ca10a0c5e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.html
@@ -29,7 +29,7 @@
</wicket:enclosure>
</ul>
</wicket:enclosure>
- <div wicket:id="noMatches" class="no-matches alert alert-light-warning"><wicket:svg href="info-circle" class="icon"/> No any matches</div>
+ <div wicket:id="noMatches" class="no-matches alert alert-notice alert-light-warning">No any matches</div>
</div>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.html
index 1e47639ac0..877e4e2e99 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.html
@@ -35,8 +35,8 @@
</li>
</ul>
</li>
- <li wicket:id="noMatchingResult" class="no-matching-result my-2 alert alert-light-warning">
- <wicket:svg href="warning" class="icon mr-1"/> Nothing matching your query
+ <li wicket:id="noMatchingResult" class="no-matching-result my-2 alert alert-notice alert-light-warning">
+ Nothing matching your query
</li>
</ul>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
index 59e0622f12..ce2a6c0a8e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
@@ -23,7 +23,7 @@
<div class="title my-2">
<a wicket:id="branchLink" class="name mr-2"><span wicket:id="name"></span></a>
<span wicket:id="buildStatus" class="build-status mr-2"></span>
- <span class="badge badge-secondary mr-2" wicket:id="default">default</span>
+ <span class="badge badge-info mr-2" wicket:id="default">default</span>
</div>
<div class="commit-message mb-2">
<span wicket:id="message"></span>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
index 8532a58691..7cfb73f537 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
@@ -19,7 +19,7 @@
</div>
<div class="card-body d-flex flex-grow-1 position-relative">
<div class="main flex-grow-1 d-flex flex-column">
- <pre wicket:id="errorMessage" class="error-message alert alert-danger ps ps-scroll mb-4 flex-shrink-0"></pre>
+ <pre wicket:id="errorMessage" class="error-message alert alert-notice alert-light-danger overflow-auto mb-4 flex-shrink-0 p-3"></pre>
<ul wicket:id="buildTabs" class="tabs nav nav-tabs nav nav-tabs-line nav-bold mb-5 flex-shrink-0"></ul>
<wicket:child></wicket:child>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java
index 147c8ffd7d..d003515581 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java
@@ -193,7 +193,7 @@ public class BuildArtifactsPage extends BuildDetailPage {
});
} else {
- add(new Label("artifacts", "No artifacts published").add(AttributeAppender.append("class", "alert alert-light-warning alert-custom alert-notice mb-0")));
+ add(new Label("artifacts", "No artifacts published").add(AttributeAppender.append("class", "alert alert-light-warning alert-notice mb-0")));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css
index 766c99e6bf..4891c726a8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css
@@ -8,7 +8,3 @@
.build-detail>.card-body>.main>.error-message {
max-height: 100px;
}
-.build-detail>.card-body>.main>.error-message.ps.ps-scroll>.ps__rail-x>.ps__thumb-x,
-.build-detail>.card-body>.main>.error-message.ps.ps-scroll>.ps__rail-y>.ps__thumb-y {
- background: var(--light-danger);
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.html
index 60cac14018..d40152c7e4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div wicket:id="log" class="d-flex flex-grow-1"></div>
+ <div wicket:id="log" class="d-flex flex-grow-1 position-relative"></div>
<wicket:fragment wicket:id="optionsFrag">
<div>
<a wicket:id="download" class="btn btn-light btn-hover-primary btn-icon btn-sm btn-xs" title="Download full log"><wicket:svg href="download" class="icon"/></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
index dbedb099dd..1e0f26f86f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
@@ -28,16 +28,16 @@
</div>
</div>
</div>
- <div wicket:id="effectiveRequest" class="alert alert-custom alert-notice alert-light-success mb-5">
- <span wicket:id="description" class="mr-2"></span> <a wicket:id="link"><span wicket:id="label"></span></a>
+ <div wicket:id="effectiveRequest" class="alert alert-notice alert-light-success mb-5">
+ <span wicket:id="description"></span> <a wicket:id="link"><span wicket:id="label"></span></a>
</div>
<div>
<a wicket:id="createRequest" class="btn btn-primary btn-block mb-5"><wicket:svg href="plus" class="icon mr-2"/> Create Pull Request for This Change</a>
</div>
- <div wicket:id="revisionNotSpecified" class="alert alert-custom alert-notice alert-light-warning mb-5">
+ <div wicket:id="revisionNotSpecified" class="alert alert-notice alert-light-warning mb-5">
<span>Please select revisions to compare</span>
</div>
- <div wicket:id="unrelatedHistory" class="alert alert-custom alert-notice alert-light-warning mb-5">
+ <div wicket:id="unrelatedHistory" class="alert alert-notice alert-light-warning mb-5">
<span>History of comparing revisions is unrelated</span>
</div>
<wicket:enclosure child="tabs">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.html
index 56de785d9e..f8438d41f8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.html
@@ -8,6 +8,6 @@
<a wicket:id="viewAsList" title="Show issues in list" class="view-list ml-1"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>
</div>
</div>
- <div wicket:id="body" class="body flex-grow-1 d-flex flex-column ps ps-scroll px-4 pt-4"></div>
+ <div wicket:id="body" class="body flex-grow-1 d-flex flex-column overflow-auto px-4 pt-4"></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.html
index 3c33f14143..24749580c6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.html
@@ -9,6 +9,6 @@
<a wicket:id="viewAsList" title="Show issues in list" class="show-list ml-1"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>
</div>
</div>
- <div wicket:id="body" class="body flex-grow-1 ps ps-scroll px-4 pt-4"></div>
+ <div wicket:id="body" class="body flex-grow-1 overflow-auto px-4 pt-4"></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.html
index 689027ff0f..1ad154870b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.html
@@ -1,4 +1,4 @@
<wicket:panel>
<div wicket:id="feedback"></div>
- <div wicket:id="cards" class="board-card mb-4 rounded p-3 bg-white"></div>
+ <div wicket:id="cards" class="board-card rounded mb-4 p-3 bg-white"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
index f934d8f70d..35e1863451 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
@@ -16,8 +16,8 @@ import org.apache.wicket.model.LoadableDetachableModel;
import com.google.common.collect.Sets;
-import io.onedev.server.OneDev;
import io.onedev.server.GeneralException;
+import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
@@ -44,7 +44,8 @@ abstract class CardListPanel extends Panel {
RepeatingView cardsView = new RepeatingView("cards");
int index = 0;
try {
- for (Issue issue: queryIssues(0, WebConstants.PAGE_SIZE)) {
+ List<Issue> issues = queryIssues(0, WebConstants.PAGE_SIZE);
+ for (Issue issue: issues) {
Long issueId = issue.getId();
IModel<Issue> model = new LoadableDetachableModel<Issue>() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html
index 9ee48a07d3..a9b933821e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html
@@ -1,42 +1,44 @@
<wicket:extend>
<div wicket:id="content" class="issue-boards flex-grow-1 d-flex flex-column"></div>
<wicket:fragment wicket:id="hasBoardsFrag">
- <div class="head flex-shrink-0 bg-white rounded">
- <form wicket:id="query" class="clearable-wrapper">
- <div class="input-group">
- <span class="input-group-prepend">
- <a wicket:id="board" title="Board" class="board-selector btn btn-outline-secondary btn-hover-primary">
- <wicket:svg href="split" class="icon mr-2"></wicket:svg>
- <span wicket:id="label"></span>
- <wicket:svg href="arrow" class="icon rotate-90 ml-1"></wicket:svg>
- </a>
- <a wicket:id="backlog" class="backlog btn btn-outline-secondary btn-hover-primary"><wicket:svg href="inbox" class="icon mr-2"></wicket:svg> Backlog</a>
- <a wicket:id="milestone"></a>
- </span>
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control">
- <span class="input-group-append">
- <button wicket:id="submit" type="submit" class="btn btn-icon btn-outline-secondary btn-hover-primary" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
- <button wicket:id="orderBy" class="btn btn-icon btn-outline-secondary btn-hover-primary" title="Order by"><wicket:svg href="sort" class="icon"></wicket:svg></button>
- </span>
+ <div class="head flex-shrink-0">
+ <form wicket:id="query" class="d-flex flex-wrap flex-md-nowrap">
+ <span class="btn-group flex-shrink-0 mr-0 mr-md-4 mb-3 mb-md-0">
+ <a wicket:id="board" title="Board" class="board-selector btn btn-outline-secondary btn-hover-primary text-nowrap bg-white">
+ <wicket:svg href="split" class="icon mr-2"></wicket:svg>
+ <span wicket:id="label"></span>
+ <wicket:svg href="arrow" class="icon rotate-90 ml-1"></wicket:svg>
+ </a>
+ <a wicket:id="backlog" class="bg-white backlog btn btn-outline-secondary btn-hover-primary text-nowrap"><wicket:svg href="inbox" class="icon mr-2"></wicket:svg> Backlog</a>
+ <a wicket:id="milestone"></a>
+ </span>
+ <div class="clearable-wrapper w-100 w-auto-md flex-grow-1">
+ <div class="input-group">
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control">
+ <span class="input-group-append text-nowrap">
+ <button wicket:id="submit" type="submit" class="bg-white btn btn-icon btn-outline-secondary btn-hover-primary" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
+ <button wicket:id="orderBy" class="bg-white btn btn-icon btn-outline-secondary btn-hover-primary" title="Order by"><wicket:svg href="sort" class="icon"></wicket:svg></button>
+ </span>
+ </div>
</div>
</form>
</div>
<div wicket:id="body" class="body flex-grow-1 d-flex flex-column">
<div wicket:id="feedback" class="feedback flex-shrink-0"></div>
- <div class="columns flex-grow-1 d-flex mt-5 autofit ps ps-scroll pb-5">
+ <div class="columns flex-grow-1 d-flex mt-5 autofit overflow-auto pb-5">
<div wicket:id="columns" class="column d-flex flex-column overflow-hidden"></div>
</div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="noBoardsFrag">
- <div class="alert alert-notice alert-custom alert-light-success shadow no-boards">
+ <div class="alert alert-notice alert-light-success shadow no-boards">
<span class="mr-3">No issue boards defined</span>
<a wicket:id="newBoard" class="mr-3"><wicket:svg href="plus" class="icon mr-1"></wicket:svg>Add New</a>
<a wicket:id="useDefault"><wicket:svg href="undo" class="icon mr-1"></wicket:svg>Use Default</a>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="hasMilestoneFrag">
- <a wicket:id="link" title="Milestone" class="milestone-selector btn">
+ <a wicket:id="link" title="Milestone" class="milestone-selector btn text-nowrap bg-white">
<wicket:svg href="milestone" class="icon mr-2"></wicket:svg>
<span wicket:id="label"></span>
<wicket:svg href="arrow" class="icon rotate-90 ml-1"></wicket:svg>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
index d936cc0947..21817e7359 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
@@ -58,7 +58,6 @@ import io.onedev.server.search.entity.issue.IssueQueryLexer;
import io.onedev.server.search.entity.issue.NumberCriteria;
import io.onedev.server.search.entity.issue.TitleCriteria;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.DateUtils;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.asset.icon.IconScope;
import io.onedev.server.web.behavior.IssueQueryBehavior;
@@ -431,10 +430,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {
@Override
public String getObject() {
- String label = getMilestone().getName();
- if (getMilestone().getDueDate() != null)
- label += " (" + DateUtils.formatDate(getMilestone().getDueDate()) + ")";
- return label;
+ return getMilestone().getName();
}
}));
@@ -654,9 +650,9 @@ public class IssueBoardsPage extends ProjectIssuesPage {
});
if (backlog)
- queryInput.add(AttributeAppender.append("placeholder", "Filter backlog issues"));
+ queryInput.add(AttributeAppender.append("placeholder", "Filter backlog issues..."));
else
- queryInput.add(AttributeAppender.append("placeholder", "Filter issues"));
+ queryInput.add(AttributeAppender.append("placeholder", "Filter issues..."));
form.add(queryInput);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
index 6e66e6324c..59f18c1762 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
@@ -7,6 +7,7 @@
.issue-boards>.body>.feedback>.feedbackPanel {
margin-bottom: 0;
margin-top: 1rem;
+ box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.1);
}
.issue-boards>.body>.columns>.column>.content {
border: 1px solid var(--secondary);
@@ -33,6 +34,10 @@
.issue-boards>.body>.columns>.column>.content>.body.issue-droppable.ui-droppable-hover {
background: #FAE280;
}
+.issue-boards>.body>.columns>.column {
+ margin-left: 2rem;
+ min-width: 256px;
+}
.floating>.content>.milestone-menu>table>tbody>tr:first-child>td {
border-top: none;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
index 145e275f0f..ee840f9daf 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
@@ -30,19 +30,19 @@
</wicket:enclosure>
</div>
<wicket:fragment wicket:id="effectiveFrag">
- <div class="alert alert-custom alert-notice alert-light-success shadow mb-5">
- <span wicket:id="description" class="mr-2"></span> <a wicket:id="link"><span wicket:id="label"></span></a>
+ <div class="alert alert-notice alert-light-success shadow mb-5">
+ <span wicket:id="description"></span> <a wicket:id="link"><span wicket:id="label"></span></a>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="sameBranchFrag">
- <div class="alert alert-custom alert-notice alert-light-warning shadow mb-5">
+ <div class="alert alert-notice alert-light-warning shadow mb-5">
<div class="summary">
<span>Please select different branches</span>
</div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="mergedFrag">
- <div class="alert alert-custom alert-notice alert-light-success shadow mb-5">
+ <div class="alert alert-notice alert-light-success shadow mb-5">
<div class="summary">
Branch <a wicket:id="targetBranch"></a> is up to date with all commits from <a wicket:id="sourceBranch"></a>.
Try <a wicket:id="swapBranches">swap source and target</a> for the comparison.
@@ -50,14 +50,14 @@
</div>
</wicket:fragment>
<wicket:fragment wicket:id="unrelatedHistoryFrag">
- <div class="alert alert-custom alert-notice alert-light-warning shadow mb-5">
+ <div class="alert alert-notice alert-light-warning shadow mb-5">
<div class="summary">
<span>History of target branch and source branch is unrelated</span>
</div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="branchNotSpecifiedFrag">
- <div class="alert alert-custom alert-notice alert-light-warning shadow mb-5">
+ <div class="alert alert-notice alert-light-warning shadow mb-5">
<div class="summary">
<span>Please select branches to create pull request</span>
</div>
@@ -79,7 +79,7 @@
<div class="form-group merge-strategy">
<label>Merge Strategy</label>
<div wicket:id="mergeStrategy">
- <select wicket:id="select" class="form-control"></select>
+ <select wicket:id="select" class="form-control custom-select"></select>
<div wicket:id="help" class="form-text text-muted"></div>
<div wicket:id="status" class="status"></div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css
index 5b21a8c349..750f188743 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css
@@ -3,9 +3,7 @@
font-weight: 600;
margin-bottom: 1rem;
}
-.new-pull-request .can-send .select2-container {
- width: 360px;
-}
+
.new-pull-request .form-group {
margin-bottom: 2rem;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
index bdb4362f4e..d45244b74e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div class="pull-request-detail card position-relative overflow-hidden m-5">
+ <div class="pull-request-detail card m-5">
<div wicket:id="requestHeader" class="card-header align-items-center justify-content-start flex-nowrap">
<div class="d-flex align-items-center flex-grow-1 mr-4">
<div wicket:id="title" class="card-title mr-3"></div>
@@ -16,7 +16,7 @@
</div>
<a wicket:id="moreInfo" class="side-info flex-shrink-0" title="More info"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>
</div>
- <div class="card-body d-flex position-relative overflow-hidden">
+ <div class="card-body d-flex">
<div class="main flex-grow-1">
<div wicket:id="statusAndBranches" class="status-and-branches d-flex mb-4">
<div wicket:id="status" class="badge status mr-3 font-size-h6"></div>
@@ -61,20 +61,20 @@
<div wicket:id="hasMergeConflict" class="has-merge-conflict text-danger">
<wicket:svg href="exclamation-circle" class="icon"></wicket:svg> There are merge conflicts.
<wicket:enclosure child="resolveInstructions">
- Please follow <a wicket:id="resolveInstructions" href="javascript:void(0);">this instruction</a> to resolve the conflicts
+ Please follow <a wicket:id="resolveInstructions" class="link-primary" href="javascript:void(0);">this instruction</a> to resolve the conflicts
</wicket:enclosure>
</div>
<div wicket:id="requestedForChanges" class="requested-for-changes text-danger">
- <wicket:svg href="times-circle-o" class="icon"></wicket:svg> Pull request can not be merged now as it was <a class="more-info d-inline">requested for changes</a>
+ <wicket:svg href="times-circle-o" class="icon"></wicket:svg> Pull request can not be merged now as it was <a class="more-info d-inline link-primary">requested for changes</a>
</div>
<div wicket:id="waitingForReviews" class="waiting-for-reviews text-warning">
- <wicket:svg href="clock" class="icon"></wicket:svg> Pull request can not be merged now as it is <a class="more-info d-inline">pending review</a>
+ <wicket:svg href="clock" class="icon"></wicket:svg> Pull request can not be merged now as it is <a class="more-info d-inline link-primary">pending review</a>
</div>
<div wicket:id="unsuccessfulBuilds" class="unsuccessful-builds text-danger">
- <wicket:svg href="times-circle-o" class="icon"></wicket:svg> Pull request can not be merged now as <a class="more-info d-inline">required builds</a> are not successful
+ <wicket:svg href="times-circle-o" class="icon"></wicket:svg> Pull request can not be merged now as <a class="more-info d-inline link-primary">required builds</a> are not successful
</div>
<div wicket:id="unfinishedBuilds" class="unfinished-builds text-warning">
- <wicket:svg href="clock-o" class="icon"></wicket:svg> Pull request can not be merged now as <a class="more-info d-inline">required builds</a> are not finished yet
+ <wicket:svg href="clock-o" class="icon"></wicket:svg> Pull request can not be merged now as <a class="more-info d-inline link-primary">required builds</a> are not finished yet
</div>
<div wicket:id="mergeableByCodeWriters" class="mergeable-by-code-writers text-info">
<wicket:svg href="info-circle-o" class="icon"></wicket:svg> Pull request can only be merged by users with code write permission
@@ -134,7 +134,7 @@
</div>
</div>
<div wicket:id="watches" class="watches"></div>
- <div wicket:id="actions" class="d-flex align-items-center">
+ <div wicket:id="actions" class="d-flex align-items-center justify-content-between">
<wicket:enclosure child="synchronize">
<div class="synchronize d-flex align-items-center mr-3">
<a wicket:id="synchronize" class="btn btn-light-primary mr-2">Synchronize</a>
@@ -143,7 +143,7 @@
</a>
</div>
</wicket:enclosure>
- <a wicket:id="delete" class="delete btn btn-light-danger ml-auto">Delete</a>
+ <a wicket:id="delete" class="delete btn btn-light-danger">Delete</a>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="projectTitleFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 1e2522fb34..7be7ed7f26 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -301,7 +301,15 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
add(newRequestHead());
add(newStatusAndBranchesContainer());
- WebMarkupContainer summaryContainer = new WebMarkupContainer("requestSummary");
+ WebMarkupContainer summaryContainer = new WebMarkupContainer("requestSummary") {
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.pullRequestDetail.onSummaryDomReady();"));
+ }
+
+ };
summaryContainer.add(new WebSocketObserver() {
@@ -778,6 +786,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
} else {
actions.add(new WebMarkupContainer("synchronize"));
actions.add(new WebMarkupContainer("delete"));
+ actions.setVisible(false);
fragment.add(actions);
}
@@ -1386,7 +1395,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(JavaScriptHeaderItem.forReference(new PullRequestDetailResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.pullRequestDetail.onDomReady();"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html
index 7121b24b38..439f6fc32c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html
@@ -9,8 +9,8 @@
<div wicket:id="addComment" class="mt-4"></div>
</div>
<wicket:fragment wicket:id="loginToCommentFrag">
- <div class="login-to-comment alert alert-light-info text-center font-size-h6">
- <a wicket:id="login">Login to comment</a>
+ <div class="login-to-comment alert alert-light text-center font-size-h6">
+ <a wicket:id="login" class="link-primary">Login to comment</a>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="addCommentFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
index 354627beef..0f41854fab 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
@@ -3,7 +3,7 @@
New commits added <span wicket:id="age"></span>
</div>
<div class="body">
- <div wicket:id="tooManyCommits" class="alert alert-light-warning"></div>
+ <div wicket:id="tooManyCommits" class="alert alert-notice alert-light-warning"></div>
<div wicket:id="commits" class="commit d-flex align-items-center">
<wicket:svg href="commit" class="icon flex-shrink-0 mr-2"></wicket:svg>
<div class="author flex-shrink-0 mr-2"><span wicket:id="author"></span></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.html
index 0071c18eac..1a382870f2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.html
@@ -2,13 +2,13 @@
<div class="changes">
<div wicket:id="changesHead" class="head">
<div class="btn-group btn-block mb-4">
- <button wicket:id="prevCommitLink" class="btn btn-light-info btn-icon flex-grow-0 flex-shrink-0" title="Previous commit"><wicket:svg href="arrow" class="icon rotate-180"></wicket:svg></button>
- <button wicket:id="comparingCommits" class="btn btn-light-info"><span wicket:id="label"></span> <wicket:svg href="arrow" class="ml-1 icon rotate-90"></wicket:svg></button>
- <button wicket:id="nextCommitLink" class="btn btn-light-info btn-icon flex-grow-0 flex-shrink-0" title="Next commit"><wicket:svg href="arrow" class="icon"></wicket:svg></button>
+ <button wicket:id="prevCommitLink" class="btn btn-light btn-hover-primary btn-icon flex-grow-0 flex-shrink-0" title="Previous commit"><wicket:svg href="arrow" class="icon rotate-180"></wicket:svg></button>
+ <button wicket:id="comparingCommits" class="btn btn-light btn-hover-primary"><span wicket:id="label"></span> <wicket:svg href="arrow" class="ml-1 icon rotate-90"></wicket:svg></button>
+ <button wicket:id="nextCommitLink" class="btn btn-light btn-hover-primary btn-icon flex-grow-0 flex-shrink-0" title="Next commit"><wicket:svg href="arrow" class="icon"></wicket:svg></button>
</div>
<wicket:enclosure child="fullChanges">
- <div class="alert alert-light-info mb-4">
- You are viewing a subset of all changes. <a wicket:id="fullChanges">show all changes</a>
+ <div class="alert alert-notice alert-light-warning mb-4">
+ You are viewing a subset of all changes. <a wicket:id="fullChanges" class="link-primary ml-2">show all changes</a>
</div>
</wicket:enclosure>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css
index 31414d7771..52306bf0e2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css
@@ -7,7 +7,7 @@
}
.commits-selector ul a:hover {
background: var(--light);
- color: var(--gray-dark);
+ color: var(--gray-dark) !important;
}
.commits-selector ul a.selected, .commits-selector ul a.selected:hover {
background: var(--light-warning);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.html
index b9a275b62a..e07e2a14a0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.html
@@ -2,16 +2,16 @@
<div wicket:id="content" class="merge-preview"></div>
<wicket:fragment wicket:id="availableFrag">
<div class="available">
- <div class="alert alert-light-info mb-4">
- Comparing <a wicket:id="targetHead" class="link-primary">target branch</a> and <a wicket:id="mergedCommit" class="link-primary mr-1">merge preview commit</a> <span wicket:id="buildStatus" class="build-status"></span>
+ <div class="alert alert-notice alert-light mb-4">
+ Comparing <a wicket:id="targetHead" class="link-primary">target branch</a> and <a wicket:id="mergedCommit" class="link-primary">merge preview commit</a> <span wicket:id="buildStatus" class="build-status"></span>
</div>
- <div wicket:id="outDated" class="out-dated alert alert-light-warning mb-4">
- Merge preview is outdated. <a wicket:id="link">Click to refresh</a>
+ <div wicket:id="outDated" class="out-dated alert alert-notice alert-light-warning mb-4">
+ Merge preview is outdated. <a wicket:id="link" class="link-primary">Click to refresh</a>
</div>
<div wicket:id="revisionDiff" class="body"></div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="notAvailableFrag">
- <div class="not-available alert alert-light-warning">Merge preview not available</div>
+ <div class="not-available alert alert-notice alert-light-warning">Merge preview not available</div>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
index 647bcac1a3..664b26a39a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
@@ -1,3 +1,6 @@
+.pull-request-detail>.card-body {
+ min-height: fit-content;
+}
.pull-request-detail>.card-body>.main>.summary {
border: 2px dashed var(--light-gray);
padding: 1.2rem 1.5rem;
@@ -64,8 +67,7 @@ ul>li>a.code-comments.new .icon {
font-weight: 600;
margin-bottom: 0.8rem;
}
-.pull-request-detail>.card-body>.more-info>.body>.reviews>.body>.reviews,
-.pull-request-detail>.card-body>.more-info>.body>.assignments>.body>.assignments {
- width: 100%;
+.pull-request-detail .more-info .reviews a.delete,
+.pull-request-detail .more-info .assignments a.delete {
+ margin-left: auto;
}
-
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js
index 53a6eb57fd..8c047b6e9a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js
@@ -1,8 +1,7 @@
onedev.server.pullRequestDetail = {
- onDomReady: function() {
- var $main = $(".pull-request-detail>.card-body>.main");
- $main.find(">.summary .more-info").click(function() {
- $main.find(">.status-and-branches .side-info").click();
+ onSummaryDomReady: function() {
+ $(".pull-request-detail .card-body .main .more-info").click(function() {
+ $(".pull-request-detail .card-header .side-info").click();
});
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html
index e56cc10bc4..ba6ea1a47c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div class="card">
+ <div class="card project-authorizations">
<div class="card-body">
<form wicket:id="form" class="authorization-list leave-confirm">
<div wicket:id="feedback" class="mb-4"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.html
index fe2146fb3a..4f2adda5a8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
<div class="branch-protections">
- <div class="alert alert-custom alert-notice bg-white shadow mb-5">
+ <div class="alert alert-notice bg-white shadow mb-5">
<wicket:svg href="bulb" class="icon mr-2"></wicket:svg>
Define branch protection rules. The first matching rule will take effect
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html
index a5d88b92f7..d23709f7e3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div class="alert alert-custom alert-notice bg-white shadow mb-5">
+ <div class="alert alert-notice bg-white shadow mb-5">
<wicket:svg href="bulb" class="icon mr-2"/> Define rules to authorize build actions. A build action will be allowed as long as one rule allows it
</div>
<div class="card">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.html
index 73134a395a..f4c95d5e58 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div class="alert alert-custom alert-notice bg-white shadow mb-5">
+ <div class="alert alert-notice bg-white shadow mb-5">
<wicket:svg href="bulb" class="icon mr-2"/>
Define rules to preserve builds. A build will be preserved as long as one rule preserves it.
All builds will be preserved if no rules are defined
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.html
index 5046bd496b..fb509cbb8f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
- <div wicket:id="secretsNote" class="alert alert-custom alert-notice bg-white shadow mb-5"></div>
- <div class="card">
+ <div wicket:id="secretsNote" class="alert alert-notice bg-white shadow mb-5"></div>
+ <div class="card job-secrets">
<div class="card-body">
<a wicket:id="addNew" class="btn btn-primary btn-icon mb-4" title="Add new secret"><wicket:svg href="plus" class="icon"></wicket:svg></a>
<table wicket:id="secrets" class="table"></table>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.html
index f19d95c662..01f2b8ab73 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.html
@@ -1,7 +1,7 @@
<wicket:extend>
<div class="card">
<div class="card-body">
- <div class="alert alert-custom alert-notice alert-light-success mb-4">
+ <div class="alert alert-notice alert-light-info mb-4">
<wicket:svg href="bulb" class="icon mr-2"/> <span wicket:id="help"></span>
</div>
<form wicket:id="form" class="leave-confirm">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css b/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
index 41fe72e3f2..6865b78e5f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
@@ -4,20 +4,16 @@
display: block;
}
-.project-setting .authorization-list .select2-container {
- width: 100%;
-}
-
-.project-setting .web-hook-list table thead th {
- font-weight: bold !important;
+.project-setting .job-secrets .job-secret-edit textarea {
+ font-family: monospace;
}
-.project-setting .web-hook-list table thead th.property-eventTypes {
+
+.project-setting .web-hooks .bean-list td.property-eventTypes {
width: 25%;
}
-.project-setting .web-hook-list table .select2-container {
- width: 100%;
-}
-
-.job-secret-edit textarea {
- font-family: monospace;
+.project-setting .branch-protections .bean-list td.property-jobNames {
+ width: 30%;
}
+.project-setting .project-authorizations .bean-list td.property-userName {
+ width: 50%;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.html
index 1a9f052c11..38b30823c7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
<div class="tag-protections">
- <div class="alert alert-custom alert-notice bg-white shadow mb-5">
+ <div class="alert alert-notice bg-white shadow mb-5">
<wicket:svg href="bulb" class="icon mr-2"></wicket:svg>
Define tag protection rules. The first matching rule will take effect
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html
index c9d2d30c58..c5e09af4cb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html
@@ -1,9 +1,9 @@
<wicket:extend>
- <div class="alert alert-custom alert-notice bg-white shadow mb-5">
+ <div class="alert alert-notice bg-white shadow mb-5">
<wicket:svg href="bulb" class="icon mr-2"/>
OneDev will post event data in JSON format to specified URLs when subscribed events happen
</div>
- <div class="card">
+ <div class="card web-hooks">
<div class="card-body">
<form wicket:id="form" class="leave-confirm">
<div wicket:id="feedback" class="mb-4"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html
index a7de717e21..8d699b95a4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
<div class="project-contribs p-5">
- <div class="alert alert-custom alert-notice bg-white shadow mb-5">
+ <div class="alert alert-notice bg-white shadow mb-5">
<wicket:svg href="bulb" class="icon mr-2"/><span wicket:id="note"></span>
</div>
<div class="card mb-5">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js b/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
index 378b6993a1..23334b2a79 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
@@ -189,7 +189,7 @@ onedev.server.stats = {
$contrib.children().append($head);
var $left = $("<div class='mr-3 d-flex align-items-center'></div>");
$head.append($left);
- $left.append("<a class='user mr-2'><img class='avatar' src='" + contributor.authorAvatarUrl + "'></img></a>");
+ $left.append("<a class='user mr-3'><img class='avatar' src='" + contributor.authorAvatarUrl + "'></img></a>");
var alignment = {targetX: 0, targetY: 0, x: 0, y: 100, offset: 8};
$left.find("a.user").hover(function() {
diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportCssResourceReference.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportCssResourceReference.java
new file mode 100644
index 0000000000..65a982a053
--- /dev/null
+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.plugin.report.html;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class HtmlReportCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public HtmlReportCssResourceReference() {
+ super(HtmlReportCssResourceReference.class, "html-report.css");
+ }
+
+}
diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.java
index d04c2a2c5a..31265c7ab1 100644
--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.java
+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.java
@@ -6,9 +6,8 @@ import java.util.concurrent.Callable;
import org.apache.wicket.behavior.AttributeAppender;
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.OnLoadHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -60,12 +59,10 @@ public class HtmlReportPage extends BuildDetailPage {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new HtmlReportResourceReference()));
- String script = String.format("onedev.server.htmlReport.onWindowLoad('%s');", getMarkupId(true));
- response.render(OnLoadHeaderItem.forScript(script));
+ response.render(CssHeaderItem.forReference(new HtmlReportCssResourceReference()));
}
- }.add(AttributeAppender.append("src", startPageUrl.toString())));
+ }.add(AttributeAppender.append("src", startPageUrl.toString())).add(AttributeAppender.append("class", "d-flex flex-grow-1")));
} else {
add(new Label("htmlReport", "No html report published") {
@@ -75,7 +72,7 @@ public class HtmlReportPage extends BuildDetailPage {
tag.setName("div");
}
- }.add(AttributeAppender.append("class", "alert alert-custom alert-notice alert-light-warning mb-0")));
+ }.add(AttributeAppender.append("class", "alert alert-notice alert-light-warning mb-0")));
}
}
diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportResourceReference.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportResourceReference.java
deleted file mode 100644
index 17075b7b92..0000000000
--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportResourceReference.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.onedev.server.plugin.report.html;
-
-import java.util.List;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.HeaderItem;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-import io.onedev.server.web.page.base.BaseDependentResourceReference;
-
-public class HtmlReportResourceReference extends BaseDependentResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public HtmlReportResourceReference() {
- super(HtmlReportResourceReference.class, "html-report.js");
- }
-
- @Override
- public List<HeaderItem> getDependencies() {
- List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
- HtmlReportResourceReference.class, "html-report.css")));
- return dependencies;
- }
-
-}
diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/html-report.js b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/html-report.js
deleted file mode 100644
index c89d67a2f5..0000000000
--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/html-report.js
+++ /dev/null
@@ -1,10 +0,0 @@
-onedev.server.htmlReport = {
- onWindowLoad: function(htmlReportId) {
- function setReportHeight() {
- var $htmlReport = $("#" + htmlReportId);
- $htmlReport.height($(window).height() - $htmlReport.offset().top - 20);
- }
- setReportHeight();
- $(window).resize(setReportHeight);
- }
-}
\ No newline at end of file
diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportPage.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportPage.java
index 642d33a179..c6b1da0d53 100644
--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportPage.java
+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportPage.java
@@ -86,7 +86,7 @@ public class MarkdownReportPage extends BuildDetailPage {
tag.setName("div");
}
- }.add(AttributeAppender.append("class", "alert alert-custom alert-notice alert-light-warning mb-0")));
+ }.add(AttributeAppender.append("class", "alert alert-notice alert-light-warning mb-0")));
}
}