Skip to content

Commit 0ea3e49

Browse files
authored
Merge branch 'master' into improve-tooltips-dropdowns
2 parents 3dd0b9f + a1f9d3e commit 0ea3e49

File tree

6 files changed

+46
-46
lines changed

6 files changed

+46
-46
lines changed

core/src/main/resources/hudson/tasks/Shell/global.groovy

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

core/src/main/resources/lib/form/repeatable/repeatable.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,11 @@ var repeatableSupport = {
143143
// called when 'add' button is clicked
144144
onAdd: function (n) {
145145
var addOnTop = false;
146+
if (n.classList.contains("repeatable-add-top")) {
147+
addOnTop = true;
148+
}
146149
while (n.tag == null) {
147150
n = n.parentNode;
148-
if (n.classList.contains("repeatable-add-top")) {
149-
addOnTop = true;
150-
}
151151
}
152152
n.tag.expand(addOnTop);
153153
// Hack to hide tool home when a new tool has some installers.

src/main/js/components/command-palette/models.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export function LinkResult(params) {
1919
return `<a class="jenkins-command-palette__results__item" href="${xmlEscape(
2020
params.url,
2121
)}">
22-
${params.type === "image" ? `<img alt="${xmlEscape(params.label)}" class="jenkins-command-palette__results__item__icon" src="${params.icon}" />` : ""}
22+
${params.type === "image" ? `<img alt="${xmlEscape(params.label)}" class="jenkins-command-palette__results__item__icon jenkins-avatar" src="${params.icon}" />` : ""}
2323
${params.type !== "image" ? `<div class="jenkins-command-palette__results__item__icon">${params.icon}</div>` : ""}
2424
${xmlEscape(params.label)}
2525
${params.isExternal ? Symbols.EXTERNAL_LINK : ""}

src/main/scss/components/_avatar.scss

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
.jenkins-avatar {
22
&[src] {
33
border-radius: 100px;
4-
outline: 1px solid color-mix(in sRGB, var(--text-color) 10%, transparent);
5-
background: color-mix(in sRGB, var(--text-color) 5%, transparent);
6-
outline-offset: -1px;
4+
outline: var(--jenkins-border-width) solid
5+
color-mix(in sRGB, var(--text-color-secondary) 10%, transparent);
6+
background: color-mix(in sRGB, var(--text-color-secondary) 5%, transparent);
7+
outline-offset: calc(var(--jenkins-border-width) * -1);
8+
object-fit: cover;
9+
10+
@media (prefers-contrast: more) {
11+
outline-color: var(--text-color);
12+
}
713
}
814
}

src/main/scss/components/_command-palette.scss

-8
Original file line numberDiff line numberDiff line change
@@ -186,14 +186,6 @@ $command-palette-background: color-mix(
186186
width: 1.25rem;
187187
height: 1.25rem;
188188
}
189-
190-
&[src] {
191-
border-radius: 100px;
192-
outline: 1px solid
193-
color-mix(in sRGB, var(--text-color) 10%, transparent);
194-
background: color-mix(in sRGB, var(--text-color) 5%, transparent);
195-
outline-offset: -1px;
196-
}
197189
}
198190

199191
&__description {

0 commit comments

Comments
 (0)