Skip to content

The Unified and Autonomous Development Platform

Minor css improvement of build spec

Robin Shend9ad457ee012
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.js b/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.js
index 58d931ab40..13af137bc9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.js
@@ -148,20 +148,21 @@ onedev.server.pipeline = {
});
}
}
- /*
+ /*
var arrowHead = {
left: $job.offset().left - $paper.offset().left,
top: $job.offset().top + $job.outerHeight()/2 - $paper.offset().top
}
var arrowWidth = 8;
- var arrowHeight = 16;
- paper.line(arrowHead.left, arrowHead.top, arrowHead.left - arrowWidth, arrowHead.top - arrowHeight/2).attr({
- stroke: onedev.server.pipeline.lineColor,
- strokeWidth: onedev.server.pipeline.lineWidth,
- from: dependencyJobIndexString,
- to: jobIndexString
- });
- paper.line(arrowHead.left, arrowHead.top, arrowHead.left - arrowWidth, arrowHead.top + arrowHeight/2).attr({
+ var arrowHeight = 8;
+ paper.path(
+ "M" +
+ arrowHead.left + "," + arrowHead.top + " " +
+ "l" + -1*arrowHeight + "," + -1*arrowWidth/2 + " " +
+ "l" + "0," + arrowWidth + " " +
+ "Z"
+ ).attr({
+ fill: onedev.server.pipeline.lineColor,
stroke: onedev.server.pipeline.lineColor,
strokeWidth: onedev.server.pipeline.lineWidth,
from: dependencyJobIndexString,
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html
index ff52c27c69..9ca9cf3f8d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html
@@ -22,25 +22,35 @@
<div wicket:id="detail" class="main d-flex flex-column flex-grow-1 ml-4"></div>
</wicket:fragment>
<wicket:fragment wicket:id="servicesFrag">
- <div class="side flex-shrink-0">
+ <div class="side autofit flex-shrink-0">
<div class="navs"><div wicket:id="navs" class="nav btn-group btn-block mb-3">
<a wicket:id="service" class="select btn btn-secondary justify-content-start"><span wicket:id="label"></span></a>
</div></div>
</div>
- <div wicket:id="service" class="main ml-4 flex-grow-1">
- <div wicket:id="notice"></div>
- <div wicket:id="content" class="content"></div>
+ <div wicket:id="service" class="main d-flex flex-column ml-4 flex-grow-1">
+ <div class="head">
+ <h6 class="mb-0">Service Detail</h6>
+ </div>
+ <div class="body flex-grow-1 autofit">
+ <div wicket:id="notice"></div>
+ <div wicket:id="content" class="content"></div>
+ </div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="stepTemplatesFrag">
- <div class="side flex-shrink-0">
+ <div class="side autofit flex-shrink-0">
<div class="navs"><div wicket:id="navs" class="nav btn-group btn-block mb-3">
<a wicket:id="template" class="select btn btn-secondary justify-content-start"><span wicket:id="label"></span></a>
</div></div>
</div>
- <div wicket:id="template" class="main ml-4 flex-grow-1">
- <div wicket:id="notice"></div>
- <div wicket:id="content" class="content"></div>
+ <div wicket:id="template" class="main d-flex flex-column ml-4 flex-grow-1">
+ <div class="head">
+ <h6 class="mb-0">Step Template Detail</h6>
+ </div>
+ <div class="body flex-grow-1 autofit">
+ <div wicket:id="notice"></div>
+ <div wicket:id="content" class="content"></div>
+ </div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="namedElementImportNoticeFrag">
@@ -49,22 +59,24 @@
</div>
</wicket:fragment>
<wicket:fragment wicket:id="propertiesFrag">
- <table class="table">
- <thead>
- <th>Name</th>
- <th>Value</th>
- </thead>
- <tbody>
- <tr wicket:id="properties">
- <td>
- <div><span wicket:id="name"></span> <a wicket:id="imported"><wicket:svg href="arrow2" class="icon imported"></wicket:svg></a></div>
- </td>
- <td>
- <div wicket:id="value"></div>
- </td>
- </tr>
- </tbody>
- </table>
+ <div class="autofit">
+ <table class="table">
+ <thead>
+ <th>Name</th>
+ <th>Value</th>
+ </thead>
+ <tbody>
+ <tr wicket:id="properties">
+ <td>
+ <div><span wicket:id="name"></span> <a wicket:id="imported"><wicket:svg href="arrow2" class="icon imported"></wicket:svg></a></div>
+ </td>
+ <td>
+ <div wicket:id="value"></div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</wicket:fragment>
<wicket:fragment wicket:id="jobFrag">
<a wicket:id="job" class="select btn btn-secondary text-nowrap"><span wicket:id="label"></span></a>
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 b63b7b2ad1..9191298537 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
@@ -157,7 +157,7 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
}
};
- propertiesViewer.add(AttributeAppender.append("class", "properties"));
+ propertiesViewer.add(AttributeAppender.append("class", "d-flex flex-column properties"));
} else {
propertiesViewer = new Label("content", "No properties defined");
String cssClasses = "properties not-defined alert alert-notice alert-light-warning d-flex";
@@ -540,7 +540,7 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
Component importsViewer;
if (!buildSpec.getImports().isEmpty()) {
importsViewer = PropertyContext.view("content", buildSpec, "imports");
- importsViewer.add(AttributeAppender.append("class", "imports"));
+ importsViewer.add(AttributeAppender.append("class", "imports autofit pr-2"));
} else {
importsViewer = new Label("content", "No imports defined");
String cssClasses = "imports not-defined alert alert-notice alert-light-warning d-flex";
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css
index c91b2398c4..ba62961549 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css
@@ -1,15 +1,10 @@
.build-spec {
padding: 1.5rem;
}
-.build-spec.parseable {
+.build-spec.parseable>.body>.content {
min-width: 800px;
}
-
-/*
- * Force to show blob view scrollbar on overflow as otherwise build spec will be invisible
- * if view port is narrow due to min-width setting aobve
- */
-.blob-view>.body {
+.build-spec.parseable>.body {
overflow-x: auto !important;
}
@@ -45,6 +40,7 @@
}
.build-spec.parseable>.body>.content>.side {
min-width: 220px;
+ padding-right: 1rem;
}
.build-spec.parseable>.body>.jobs.content>.side {
min-width: 360px;
@@ -73,14 +69,14 @@
border: 1px solid var(--light-gray);
padding: 1.5rem;
}
-.build-spec.parseable>.body>.jobs.content>.main {
+.build-spec.parseable>.body>.content>.main {
padding: 0;
min-width: 360px;
}
-.build-spec.parseable>.body>.jobs.content>.main>.head {
+.build-spec.parseable>.body>.content>.main>.head {
padding: 1.5rem;
}
-.build-spec.parseable>.body>.jobs.content>.main>.body {
+.build-spec.parseable>.body>.content>.main>.body {
padding: 0 1.5rem 1.5rem 1.5rem;
}
.dark-mode .build-spec.parseable>.body>.content>.main {