root
/
jenkins
mirror of https://github.com/jenkinsci/jenkins.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge branch 'master' into improve-tooltips-dropdowns

This commit is contained in:
Jan Faracik 2025-03-22 12:24:49 +00:00 committed by GitHub
parent 3dd0b9f421 a1f9d3e7e2
commit 0ea3e49fa1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
core/src/main/resources/hudson/tasks/Shell/global.groovy
View File

@ -1,31 +0,0 @@
/*
* The MIT License
*
* Copyright (c) 2011, CloudBees, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package hudson.tasks.Shell
f=namespace(lib.FormTagLib)
f.section(title:_("Shell")) {
f.entry(field: 'shell', title:_("Shell executable")) {
f.textbox()
}
}

33
core/src/main/resources/hudson/tasks/Shell/global.jelly Normal file
View File

@ -0,0 +1,33 @@
<!--
The MIT License
Copyright (c) 2025, Stefan Spieker
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
<f:section title="${%Shell}">
<f:entry title="${%Shell executable}" field="shell">
<f:textbox />
</f:entry>
</f:section>
</j:jelly>

6
core/src/main/resources/lib/form/repeatable/repeatable.js
View File

@ -143,11 +143,11 @@ var repeatableSupport = {
// called when 'add' button is clicked
onAdd: function (n) {
var addOnTop = false;
if (n.classList.contains("repeatable-add-top")) {
addOnTop = true;
}
while (n.tag == null) {
n = n.parentNode;
if (n.classList.contains("repeatable-add-top")) {
addOnTop = true;
}
}
n.tag.expand(addOnTop);
// Hack to hide tool home when a new tool has some installers.

2
src/main/js/components/command-palette/models.js
View File

@ -19,7 +19,7 @@ export function LinkResult(params) {
return `<a class="jenkins-command-palette__results__item" href="${xmlEscape(
params.url,
)}">
${params.type === "image" ? `<img alt="${xmlEscape(params.label)}" class="jenkins-command-palette__results__item__icon" src="${params.icon}" />` : ""}
${params.type === "image" ? `<img alt="${xmlEscape(params.label)}" class="jenkins-command-palette__results__item__icon jenkins-avatar" src="${params.icon}" />` : ""}
${params.type !== "image" ? `<div class="jenkins-command-palette__results__item__icon">${params.icon}</div>` : ""}
${xmlEscape(params.label)}
${params.isExternal ? Symbols.EXTERNAL_LINK : ""}

12
src/main/scss/components/_avatar.scss
View File

@ -1,8 +1,14 @@
.jenkins-avatar {
&[src] {
border-radius: 100px;
outline: 1px solid color-mix(in sRGB, var(--text-color) 10%, transparent);
background: color-mix(in sRGB, var(--text-color) 5%, transparent);
outline-offset: -1px;
outline: var(--jenkins-border-width) solid
color-mix(in sRGB, var(--text-color-secondary) 10%, transparent);
background: color-mix(in sRGB, var(--text-color-secondary) 5%, transparent);
outline-offset: calc(var(--jenkins-border-width) * -1);
object-fit: cover;
@media (prefers-contrast: more) {
outline-color: var(--text-color);
}
}
}

8
src/main/scss/components/_command-palette.scss
View File

@ -186,14 +186,6 @@ $command-palette-background: color-mix(
width: 1.25rem;
height: 1.25rem;
}
&[src] {
border-radius: 100px;
outline: 1px solid
color-mix(in sRGB, var(--text-color) 10%, transparent);
background: color-mix(in sRGB, var(--text-color) 5%, transparent);
outline-offset: -1px;
}
}
&__description {