From a7eb9a745384bfd933eb2a3767e24e33694e1e17 Mon Sep 17 00:00:00 2001 From: Stefan Spieker Date: Sat, 1 Mar 2025 17:35:00 +0100 Subject: [PATCH 1/5] replaced groovy with jelly --- .../hudson/tasks/Shell/global.groovy | 31 ----------------- .../resources/hudson/tasks/Shell/global.jelly | 33 +++++++++++++++++++ 2 files changed, 33 insertions(+), 31 deletions(-) delete mode 100644 core/src/main/resources/hudson/tasks/Shell/global.groovy create mode 100644 core/src/main/resources/hudson/tasks/Shell/global.jelly diff --git a/core/src/main/resources/hudson/tasks/Shell/global.groovy b/core/src/main/resources/hudson/tasks/Shell/global.groovy deleted file mode 100644 index 5b3c3c7596..0000000000 --- a/core/src/main/resources/hudson/tasks/Shell/global.groovy +++ /dev/null @@ -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() - } -} diff --git a/core/src/main/resources/hudson/tasks/Shell/global.jelly b/core/src/main/resources/hudson/tasks/Shell/global.jelly new file mode 100644 index 0000000000..6d53981e62 --- /dev/null +++ b/core/src/main/resources/hudson/tasks/Shell/global.jelly @@ -0,0 +1,33 @@ + + + + + + + + + + + From db64bf45dbb90aaddc653ac8f22a52f7ac5614b3 Mon Sep 17 00:00:00 2001 From: Stefan Spieker Date: Wed, 5 Mar 2025 23:38:56 +0100 Subject: [PATCH 2/5] Update core/src/main/resources/hudson/tasks/Shell/global.jelly Co-authored-by: Daniel Beck <1831569+daniel-beck@users.noreply.github.com> --- core/src/main/resources/hudson/tasks/Shell/global.jelly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/tasks/Shell/global.jelly b/core/src/main/resources/hudson/tasks/Shell/global.jelly index 6d53981e62..dc464fee22 100644 --- a/core/src/main/resources/hudson/tasks/Shell/global.jelly +++ b/core/src/main/resources/hudson/tasks/Shell/global.jelly @@ -24,7 +24,7 @@ THE SOFTWARE. - + From a22fcfb948164a12c244680a3db49540db455af6 Mon Sep 17 00:00:00 2001 From: Stefan Spieker Date: Wed, 5 Mar 2025 23:48:35 +0100 Subject: [PATCH 3/5] Update core/src/main/resources/hudson/tasks/Shell/global.jelly Co-authored-by: Daniel Beck <1831569+daniel-beck@users.noreply.github.com> --- core/src/main/resources/hudson/tasks/Shell/global.jelly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/tasks/Shell/global.jelly b/core/src/main/resources/hudson/tasks/Shell/global.jelly index dc464fee22..2c6cb76225 100644 --- a/core/src/main/resources/hudson/tasks/Shell/global.jelly +++ b/core/src/main/resources/hudson/tasks/Shell/global.jelly @@ -23,7 +23,7 @@ THE SOFTWARE. --> - + From 3c43b58504f6133ebb95fb849c6bc50d23df1b2d Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu, 20 Mar 2025 10:19:01 +0000 Subject: [PATCH 4/5] Update avatar in high contrast mode --- src/main/js/components/command-palette/models.js | 2 +- src/main/scss/components/_avatar.scss | 12 +++++++++--- src/main/scss/components/_command-palette.scss | 8 -------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/main/js/components/command-palette/models.js b/src/main/js/components/command-palette/models.js index 79d35fcf7b..ced3aa4266 100644 --- a/src/main/js/components/command-palette/models.js +++ b/src/main/js/components/command-palette/models.js @@ -19,7 +19,7 @@ export function LinkResult(params) { return ` - ${params.type === "image" ? `${xmlEscape(params.label)}` : ""} + ${params.type === "image" ? `${xmlEscape(params.label)}` : ""} ${params.type !== "image" ? `
${params.icon}
` : ""} ${xmlEscape(params.label)} ${params.isExternal ? Symbols.EXTERNAL_LINK : ""} diff --git a/src/main/scss/components/_avatar.scss b/src/main/scss/components/_avatar.scss index d1aa785b8b..5e1185cc30 100644 --- a/src/main/scss/components/_avatar.scss +++ b/src/main/scss/components/_avatar.scss @@ -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); + } } } diff --git a/src/main/scss/components/_command-palette.scss b/src/main/scss/components/_command-palette.scss index 8bec54eb62..656c34f8f2 100644 --- a/src/main/scss/components/_command-palette.scss +++ b/src/main/scss/components/_command-palette.scss @@ -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 { From 4c262520973db3a71f3d4a0e6e2f9c85995af5b0 Mon Sep 17 00:00:00 2001 From: Markus Winter Date: Thu, 20 Mar 2025 18:31:31 +0100 Subject: [PATCH 5/5] fix enable top button in a repeatable that has enabelTopButton set, clicking on the top button actually didn't insert it to the top but to the end --- core/src/main/resources/lib/form/repeatable/repeatable.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/resources/lib/form/repeatable/repeatable.js b/core/src/main/resources/lib/form/repeatable/repeatable.js index 3f19dcfb7e..5c81b3810a 100644 --- a/core/src/main/resources/lib/form/repeatable/repeatable.js +++ b/core/src/main/resources/lib/form/repeatable/repeatable.js @@ -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.