Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-73695] BUG: Dashboard shows white space on certain width space >900px #9667

Merged
merged 5 commits into from
Sep 1, 2024
Merged

[JENKINS-73695] BUG: Dashboard shows white space on certain width space >900px #9667

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da41e54
[no_space] use overlow for table
scherler Aug 27, 2024
49fc59d
Merge remote-tracking branch 'upstream/master' into no_space
scherler Aug 27, 2024
c084563
Merge branch 'master' into no_space
scherler Aug 28, 2024
db2e78b
[no_space] fix typo and rename class
scherler Aug 29, 2024
9d9dc53
Merge branch 'master' into no_space
scherler Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions core/src/main/resources/lib/hudson/projectView.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,23 +67,25 @@ THE SOFTWARE.
</div>

<div class="jenkins-mobile-hide">
<table id="projectstatus" class="jenkins-table ${iconSize == '16x16' ? 'jenkins-table--small' : iconSize == '24x24' ? 'jenkins-table--medium' : ''} sortable">
<thead>
<tr>
<j:forEach var="col" items="${columnExtensions}">
<j:if test="${col.class.simpleName.equals('BuildButtonColumn')}">
<j:set var="buildButtonColumn" value="${col}" />
</j:if>
<st:include page="columnHeader.jelly" it="${col}" />
</j:forEach>
</tr>
</thead>
<div class="jenkins-projectstatus-table">
scherler marked this conversation as resolved.
Show resolved Hide resolved
<table id="projectstatus" class="jenkins-table ${iconSize == '16x16' ? 'jenkins-table--small' : iconSize == '24x24' ? 'jenkins-table--medium' : ''} sortable">
<thead>
<tr>
<j:forEach var="col" items="${columnExtensions}">
<j:if test="${col.class.simpleName.equals('BuildButtonColumn')}">
<j:set var="buildButtonColumn" value="${col}" />
</j:if>
<st:include page="columnHeader.jelly" it="${col}" />
</j:forEach>
</tr>
</thead>

<j:forEach var="job" items="${jobs}">
<j:set var="relativeLinkToJob" value="${h.getRelativeLinkTo(job)}"/>
<t:projectViewRow jobBaseUrl="${relativeLinkToJob.substring(0, relativeLinkToJob.length() - job.shortUrl.length())}"/>
</j:forEach>
</table>
<j:forEach var="job" items="${jobs}">
<j:set var="relativeLinkToJob" value="${h.getRelativeLinkTo(job)}"/>
<t:projectViewRow jobBaseUrl="${relativeLinkToJob.substring(0, relativeLinkToJob.length() - job.shortUrl.length())}"/>
</j:forEach>
</table>
</div>
<t:iconSize><t:rssBar/></t:iconSize>
</div>

Expand Down
1 change: 1 addition & 0 deletions war/src/main/scss/abstracts/_theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@ $semantics: (
--tab-baseline-default-display: none;

// Side panel
--sidep-panel-width: 340px;
scherler marked this conversation as resolved.
Show resolved Hide resolved
--panel-header-bg-color: var(--light-grey);
--panel-border-color: var(--light-grey);
--side-panel-hover-color: var(--panel-border-color);
Expand Down
13 changes: 10 additions & 3 deletions war/src/main/scss/base/_layout-commons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
}

body.two-column #main-panel {
width: calc(100% - 320px);
width: calc(100% - var(--sidep-panel-width));
flex: 1;
display: block;
}
Expand All @@ -98,7 +98,7 @@ body.full-screen #main-panel {
}

body.two-column #side-panel {
width: 340px;
width: var(--sidep-panel-width);
}

/* stylelint-disable-next-line media-query-no-invalid */
Expand All @@ -118,9 +118,16 @@ body.two-column #side-panel {
}
}

.jenkins-projectstatus-table {
width: 100%;
overflow-x: auto;
}

@media (width >= 1170px) {
body.two-column #main-panel {
width: calc(100% - 370px);
width: calc(
100% - calc(var(--sidep-panel-width) + calc(var(--section-padding) * 2))
);
}
}

Expand Down
Loading