Skip to content

The Unified and Autonomous Development Platform

fix: Tall SideInfoPanel content unreachable when main content is shorter than the sidebar

Robin Shenc75feeb82206
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html
index af6ca03df5..03e60f2707 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html
@@ -25,7 +25,7 @@
</wicket:enclosure>
<div>
<div class="name"><wicket:t>Job</wicket:t></div>
- <div class="value">
+ <div class="value text-break">
<a wicket:id="job"><span wicket:id="label"></span></a>
<a wicket:id="editJob" class="ml-2 btn btn-icon btn-xs btn-light btn-hover-primary" t:data-tippy-content="Edit job"><wicket:svg href="edit" class="icon icon-sm"/></a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.html
index 3a78e6c538..1e649d9c4b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.html
@@ -1,7 +1,9 @@
<wicket:panel>
- <div class="header d-flex align-items-center flex-shrink-0 border-bottom">
- <div wicket:id="title" class="title flex-grow-1"></div>
- <a wicket:id="close" t:data-tippy-content="Hide" class="flex-shrink-0 ml-4 close align-items-center"><wicket:svg href="times" class="icon"/></a>
+ <div class="content d-flex flex-column">
+ <div class="header d-flex align-items-center flex-shrink-0 border-bottom">
+ <div wicket:id="title" class="title flex-grow-1"></div>
+ <a wicket:id="close" t:data-tippy-content="Hide" class="flex-shrink-0 ml-4 close align-items-center"><wicket:svg href="times" class="icon"/></a>
+ </div>
+ <div wicket:id="body" class="body flex-grow-1"></div>
</div>
- <div wicket:id="body" class="body flex-grow-1"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.css b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.css
index ea7221a152..9d839b7e07 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.css
@@ -16,19 +16,19 @@ div.side-info {
border-left: 1px solid var(--dark-mode-light-dark);
background: var(--dark-mode-dark);
}
-div.side-info>.header, div.side-info>.footer {
+div.side-info>.content>.header, div.side-info>.content>.footer {
padding: 1.5rem 2rem;
}
-div.side-info>.body {
+div.side-info>.content>.body {
padding: 2rem 2.25rem;
}
-div.side-info>.header .close {
+div.side-info>.content>.header .close {
border-left: 1px solid var(--secondary);
margin-left: 0.6rem;
padding-left: 0.6rem;
display: flex;
}
-.dark-mode div.side-info>.header .close {
+.dark-mode div.side-info>.content>.header .close {
border-left-color: var(--dark-mode-dark-gray);
}
@@ -40,14 +40,12 @@ a.side-info {
display: none;
}
-/* Pinned pane on wide viewports (non-overlay layouts): stick under top
- chrome while sharing the page scroller — no inner scrollbar / max-height.
- top: 0 is relative to .autofit, which already sits below the fixed topbar. */
+/* Stretch the pane so its border spans the full content height, while keeping
+ its content pinned under the top chrome in the shared page scroller. */
@media(min-width: 1199px) {
- div.side-info {
+ div.side-info>.content {
position: sticky;
top: 0;
- align-self: flex-start;
}
div.side-info.closed {
width: 0;
@@ -71,6 +69,9 @@ a.side-info {
z-index: 1050;
margin: 0;
}
+ div.side-info>.content {
+ height: 100%;
+ }
.dark-mode div.side-info {
box-shadow: 0 0 30px rgb(0 0 0 / 50%);
}
@@ -78,7 +79,7 @@ a.side-info {
right: -360px;
box-shadow: none;
}
- div.side-info>.body {
+ div.side-info>.content>.body {
overflow: auto;
}
}
@@ -94,6 +95,9 @@ a.side-info {
margin: 0;
width: 360px;
}
+.hide-side-info div.side-info>.content {
+ height: 100%;
+}
.dark-mode .hide-side-info div.side-info {
box-shadow: 0 0 30px rgb(0 0 0 / 50%);
}
@@ -106,9 +110,9 @@ a.side-info {
overflow: visible;
pointer-events: auto;
}
-.hide-side-info div.side-info>.header .close {
+.hide-side-info div.side-info>.content>.header .close {
display: flex;
}
-.hide-side-info div.side-info>.body {
+.hide-side-info div.side-info>.content>.body {
overflow: auto;
}
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 3bb49a6868..65fb5cf848 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
@@ -839,6 +839,13 @@ table>thead>tr>th.minimum:last-child, table>tbody>tr>td.minimum:last-child {
overflow: hidden !important;
min-height: inherit !important;
}
+/* Applied dynamically for an autofit-outer boundary */
+.autofit-scroll-parent {
+ overflow: auto !important;
+}
+.autofit-overflow-parent {
+ overflow: visible !important;
+}
span.keycap {
white-space: nowrap;
border: 1px outset var(--muted);
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 7220e2567a..518886378f 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
@@ -960,6 +960,31 @@ onedev.server = {
var $parents = $autofit.css("overflow", "auto").parents().not("html").not("body");
$parents.addClass("autofit-parent");
$(".autofit-parent").not($parents).removeClass("autofit-parent");
+
+ /*
+ * An inner autofit normally clips all ancestors so it is the only scroll container.
+ * Each autofit-outer boundary keeps that inner sizing behavior below the boundary,
+ * while allowing sibling overflow to propagate to its nearest outer autofit scroller.
+ * Processing all ancestor boundaries makes this work at multiple nested scroll levels.
+ */
+ var $outerScrollParents = $();
+ var $overflowParents = $();
+ $autofit.each(function() {
+ $(this).parents(".autofit-outer").each(function() {
+ var $boundary = $(this);
+ var $outerScrollParent = $boundary.parents(".autofit").first();
+ if ($outerScrollParent.length != 0) {
+ $outerScrollParents = $outerScrollParents.add($outerScrollParent);
+ $overflowParents = $overflowParents
+ .add($boundary)
+ .add($boundary.parentsUntil($outerScrollParent));
+ }
+ });
+ });
+ $outerScrollParents.addClass("autofit-scroll-parent");
+ $(".autofit-scroll-parent").not($outerScrollParents).removeClass("autofit-scroll-parent");
+ $overflowParents.addClass("autofit-overflow-parent");
+ $(".autofit-overflow-parent").not($overflowParents).removeClass("autofit-overflow-parent");
$(document).find(".resize-aware").trigger("resized");
});
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 6f9fc7ff20..ec658fe7fe 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
@@ -22,7 +22,7 @@
<a wicket:id="moreInfo" class="more-info side-info ml-auto" t:data-tippy-content="More info"><wicket:svg href="ellipsis" class="icon"/></a>
</div>
</div>
- <div class="card-body d-flex flex-grow-1 position-relative">
+ <div class="card-body d-flex flex-grow-1 position-relative autofit-outer">
<div class="main flex-grow-1 d-flex flex-column">
<div wicket:id="buildSpecNotFound" class="alert alert-notice alert-light-warning"><wicket:t>Build spec not found in commit of this build</wicket:t></div>
<div wicket:id="jobNotFound" class="alert alert-notice alert-light-warning">