Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ THE SOFTWARE.
<gitHubRepo>jenkinsci/design-library-plugin</gitHubRepo>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.479</jenkins.baseline>
<jenkins.version>2.516</jenkins.version>
<jenkins.version>2.541</jenkins.version>
<node.version>22.15.0</node.version>
<npm.version>11.6.4</npm.version>
<spotless.check.skip>false</spotless.check.skip>
Expand Down
102 changes: 53 additions & 49 deletions src/main/resources/io/jenkins/plugins/designlibrary/Home/index.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -14,59 +14,63 @@
}
</style>

<s:section hideBorder="true">
<div class="app-card__container app-card__container--large">
<div class="app-card__preview">
<div class="app-card__preview__introduction">
<img src="${imagesURL}/svgs/logo.svg" alt="${%Jenkins illustration}" />
<div class="app-settings-container">
<div class="app-settings-container__inner">
<s:section hideBorder="true">
<div class="app-card__container app-card__container--large">
<div class="app-card__preview">
<div class="app-card__preview__introduction">
<img src="${imagesURL}/svgs/logo.svg" alt="${%Jenkins illustration}" />
</div>
</div>
<p class="app-card__title">${%welcome}</p>
<p class="app-card__description">${%description}</p>
</div>
</div>
<p class="app-card__title">${%welcome}</p>
<p class="app-card__description">${%description}</p>
</div>
</s:section>
</s:section>

<s:section title="${%topics}">
<div class="app-home__side-by-side">
<s:card icon="symbol-cards plugin-design-library"
title="${%cards}"
description="${%cards-description}"
href="cards"
tag="${%New}" />
<s:card icon="symbol-dropdown-menu plugin-design-library"
title="${%menu}"
description="${%menu-description}"
href="menu"
tag="${%New}" />
<s:card icon="symbol-buttons plugin-design-library"
title="${%buttons}"
description="${%buttons-description}"
href="buttons" />
<s:card icon="symbol-star-outline plugin-ionicons-api"
title="${%symbols}"
description="${%symbols-description}"
href="symbols" />
</div>
</s:section>
<s:section title="${%topics}">
<div class="app-home__side-by-side">
<s:card icon="symbol-cards plugin-design-library"
title="${%cards}"
description="${%cards-description}"
href="cards"
tag="${%New}" />
<s:card icon="symbol-dropdown-menu plugin-design-library"
title="${%menu}"
description="${%menu-description}"
href="menu"
tag="${%New}" />
<s:card icon="symbol-buttons plugin-design-library"
title="${%buttons}"
description="${%buttons-description}"
href="buttons" />
<s:card icon="symbol-star-outline plugin-ionicons-api"
title="${%symbols}"
description="${%symbols-description}"
href="symbols" />
</div>
</s:section>

<s:section title="${%get-involved}">
<div class="app-home__side-by-side">
<s:card icon="symbol-gitter plugin-design-library"
title="${%gitter-description}"
href="https://gitter.im/jenkinsci/ux-sig" />
<s:card icon="symbol-logo-youtube plugin-ionicons-api"
title="${%ux-youtube}"
href="https://www.youtube.com/playlist?list=PLN7ajX_VdyaOnsIIsZHsv_fM9QhOcajWe" />
<s:card icon="symbol-logo-github plugin-ionicons-api"
title="${%ux-wip-core}"
href="https://github.com/jenkinsci/jenkins/pulls?q=is%3Apr+is%3Aopen+label%3Aweb-ui" />
<s:card icon="symbol-heart-outline plugin-ionicons-api"
title="${%contribute}"
href="https://github.com/jenkinsci/design-library-plugin" />
</div>
</s:section>
<s:section title="${%get-involved}">
<div class="app-home__side-by-side">
<s:card icon="symbol-gitter plugin-design-library"
title="${%gitter-description}"
href="https://gitter.im/jenkinsci/ux-sig" />
<s:card icon="symbol-logo-youtube plugin-ionicons-api"
title="${%ux-youtube}"
href="https://www.youtube.com/playlist?list=PLN7ajX_VdyaOnsIIsZHsv_fM9QhOcajWe" />
<s:card icon="symbol-logo-github plugin-ionicons-api"
title="${%ux-wip-core}"
href="https://github.com/jenkinsci/jenkins/pulls?q=is%3Apr+is%3Aopen+label%3Aweb-ui" />
<s:card icon="symbol-heart-outline plugin-ionicons-api"
title="${%contribute}"
href="https://github.com/jenkinsci/design-library-plugin" />
</div>
</s:section>

<s:previous-next-controls previousPage="${null}" nextPage="${it.all.0}" />
<s:previous-next-controls previousPage="${null}" nextPage="${it.all.0}" />
</div>
</div>
</l:main-panel>
</l:layout>
</j:jelly>
26 changes: 15 additions & 11 deletions src/main/resources/lib/samples/layout.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,24 @@ THE SOFTWARE.
</l:side-panel>

<l:main-panel>
<l:app-bar title="${it.displayName}">
<j:if test="${it.since != null}">
<a href="https://www.jenkins.io/changelog/${it.since}" class="jenkins-button jdl-since-tag" target="_blank">
<l:icon src="symbol-information-circle-outline plugin-ionicons-api" />
Since ${it.since}
</a>
</j:if>
</l:app-bar>
<div class="app-settings-container">
<div class="app-settings-container__inner">
<l:app-bar title="${it.displayName}">
<j:if test="${it.since != null}">
<a href="https://www.jenkins.io/changelog/${it.since}" class="jenkins-button jdl-since-tag" target="_blank">
<l:icon src="symbol-information-circle-outline plugin-ionicons-api" />
Since ${it.since}
</a>
</j:if>
</l:app-bar>

<p class="jdl-subtitle">${it.description}</p>
<p class="jdl-subtitle">${it.description}</p>

<d:invokeBody/>
<d:invokeBody/>

<s:previous-next-controls previousPage="${it.previousPage}" nextPage="${it.nextPage}" />
<s:previous-next-controls previousPage="${it.previousPage}" nextPage="${it.nextPage}" />
</div>
</div>
</l:main-panel>
</l:layout>
</j:jelly>
2 changes: 1 addition & 1 deletion src/main/resources/lib/samples/sidepanel.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<l:task title="${%Home}" href="${rootURL}/design-library" icon="symbol-design-library plugin-design-library" contextMenu="false" />

<j:forEach var="s" items="${it.grouped.entrySet()}">
<div class="app-sidepanel__heading">${s.key.displayName}</div>
<div class="jenkins-side-nav__heading">${s.key.displayName}</div>
<j:forEach var="s" items="${s.value}">
<l:task title="${s.displayName}" href="${rootURL}/design-library/${s.urlName}" icon="${s.iconFileName}" />
</j:forEach>
Expand Down
16 changes: 0 additions & 16 deletions src/main/resources/scss/abstracts/_overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@
}
}

#main-panel {
margin-left: auto;
margin-right: auto;

@media (min-width: 1200px) {
max-width: min(1200px, 60vw);
}
}

code {
font-family: var(--font-family-mono) !important;
color: var(--text-color-secondary);
Expand All @@ -35,10 +26,3 @@ a {
color: unset;
}
}

.app-sidepanel__heading {
font-size: 0.875rem;
color: var(--text-color-secondary);
font-weight: 450;
margin: 1rem 0 0.25rem 0;
}
Loading