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

Merge branch 'master' into show-header-when-loading

This commit is contained in:
Jan Faracik 2025-06-06 17:59:36 +01:00 committed by GitHub
parent 62b94084c3 817ba72824
commit 714b576d2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 72 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ath.sh
View File

@ -6,7 +6,7 @@ set -o xtrace
cd "$(dirname "$0")"
# https://github.com/jenkinsci/acceptance-test-harness/releases
export ATH_VERSION=6250.v4a_41b_57c8a_84
export ATH_VERSION=6254.vca_87b_2b_59e5a_
if [[ $# -eq 0 ]]; then
export JDK=17

2
bom/pom.xml
View File

@ -41,7 +41,7 @@ THE SOFTWARE.
<commons-fileupload2.version>2.0.0-M3</commons-fileupload2.version>
<groovy.version>2.4.21</groovy.version>
<jelly.version>1.1-jenkins-20250108</jelly.version>
<stapler.version>1983.v93c53e94b_c04</stapler.version>
<stapler.version>1990.v99d303a_82457</stapler.version>
</properties>
<dependencyManagement>

2
core/src/main/java/hudson/model/ViewGroup.java
View File

@ -164,7 +164,7 @@ public interface ViewGroup extends Saveable, ModelObject, AccessControlled {
* Returns the ViewsTabBar that the user has configured.
*
* @return users TabBar
* @since TODO
* @since 2.513
*/
default ViewsTabBar getUserViewsTabBar() {
User user = User.current();

2
package.json
View File

@ -68,5 +68,5 @@
"engines": {
"node": ">=20.0.0"
},
"packageManager": "yarn@4.9.1"
"packageManager": "yarn@4.9.2"
}

2
pom.xml
View File

@ -97,7 +97,7 @@ THE SOFTWARE.
<bridge-method-injector.version>1.31</bridge-method-injector.version>
<spotless.check.skip>false</spotless.check.skip>
<!-- Make sure to keep the jetty-ee9-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->
<winstone.version>8.9</winstone.version>
<winstone.version>8.10</winstone.version>
<node.version>22.16.0</node.version>
</properties>

15
src/main/js/components/dialogs/index.js
View File

@ -188,7 +188,18 @@ Dialog.prototype.show = function () {
"cancel",
(e) => {
e.preventDefault();
this.dialog.remove();
this.dialog.setAttribute("closing", "");
this.dialog.addEventListener(
"animationend",
() => {
this.dialog.removeAttribute("closing");
this.dialog.remove();
},
{ once: true },
);
cancel();
},
{ once: true },
@ -213,8 +224,8 @@ Dialog.prototype.show = function () {
if (this.dialogType === "form") {
value = new FormData(this.form);
}
this.dialog.remove();
resolve(value);
this.dialog.dispatchEvent(new Event("cancel"));
},
{ once: true },
);

34
src/main/scss/abstracts/_theme.scss
View File

@ -180,21 +180,6 @@ $semantics: (
--link-text-decoration--active: underline;
--link-font-weight: var(--font-bold-weight);
// Command Palette
--command-palette-results-backdrop-filter: saturate(1.5) blur(5px);
--command-palette-inset-shadow:
inset 0 0 2px 2px rgb(255 255 255 / 0.1),
var(--jenkins-border--subtle-shadow),
0 5px 10px var(--jenkins-border-color--subtle);
::backdrop {
--command-palette-backdrop-background: color-mix(
in sRGB,
var(--black) 17.5%,
transparent
);
}
// Tooltips
--tooltip-backdrop-filter: contrast(1.1) saturate(2) blur(20px);
--tooltip-color: var(--text-color);
@ -209,13 +194,20 @@ $semantics: (
0 2px 10px rgb(0 0 20 / 0.05), inset 0 -1px 2px rgb(255 255 255 / 0.025);
// Dialogs
::backdrop {
--dialog-backdrop-background: hsl(240 10% 20% / 0.8);
}
--dialog-background: var(--card-background);
--dialog-box-shadow:
var(--jenkins-border--subtle-shadow), 0 10px 40px rgb(0 0 20 / 0.15),
0 2px 15px rgb(0 0 20 / 0.05), inset 0 0 2px 2px rgb(255 255 255 / 0.025);
var(--jenkins-border--subtle-shadow), 0 5px 25px rgb(0 0 10 / 0.025),
0 0 1.5px color-mix(in sRGB, var(--black) 20%, transparent),
inset 0 0 0 1px rgb(255 255 255 / 0.05);
::backdrop {
--dialog-backdrop-backdrop-filter: blur(0.25px);
--dialog-backdrop-background: color-mix(
in sRGB,
var(--black) 10%,
color-mix(in sRGB, var(--background) 55%, transparent)
);
}
// Dark link
--link-dark-color: var(--text-color);

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

@ -1,12 +1,6 @@
@use "../abstracts/mixins";
@use "../base/breakpoints";
$command-palette-background: color-mix(
in sRGB,
var(--card-background) 92.5%,
transparent
);
.jenkins-command-palette__dialog {
background: none;
border: none;
@ -19,8 +13,8 @@ $command-palette-background: color-mix(
user-select: none;
&::backdrop {
background: var(--command-palette-backdrop-background);
backdrop-filter: blur(1px);
background: var(--dialog-backdrop-background);
backdrop-filter: var(--dialog-backdrop-backdrop-filter);
animation: jenkins-dialog-backdrop-animate-in 0.075s linear;
}
@ -82,13 +76,12 @@ $command-palette-background: color-mix(
&__search {
--search-bar-height: 3rem !important;
background: $command-palette-background;
box-shadow: var(--command-palette-inset-shadow);
background: var(--dialog-background);
box-shadow: var(--dialog-box-shadow);
margin-bottom: var(--section-padding);
border-radius: 1rem;
transition: var(--standard-transition);
z-index: 10;
backdrop-filter: var(--command-palette-results-backdrop-filter);
max-width: unset;
input {
@ -115,9 +108,8 @@ $command-palette-background: color-mix(
display: flex;
flex-direction: column;
border-radius: 1rem;
background: $command-palette-background;
backdrop-filter: var(--command-palette-results-backdrop-filter);
box-shadow: var(--command-palette-inset-shadow);
background: var(--dialog-background);
box-shadow: var(--dialog-box-shadow);
// If set to 0, Safari won't always show the backdrop-filter
height: 1px;

40
src/main/scss/components/_dialogs.scss
View File

@ -1,9 +1,10 @@
$jenkins-dialog-padding: 1.25rem;
$jenkins-dialog-padding: 1.5rem;
$jenkins-dialog-font-size: 0.9375rem;
.jenkins-dialog {
border-radius: var(--form-input-border-radius);
border-radius: 1rem;
border: none;
background-color: var(--card-background);
background-color: var(--dialog-background);
box-shadow: var(--dialog-box-shadow);
animation: jenkins-dialog-animate-in 0.25s cubic-bezier(0, 0.68, 0.5, 1.5);
overflow: hidden;
@ -14,7 +15,12 @@ $jenkins-dialog-padding: 1.25rem;
outline: none;
&::backdrop {
background: var(--dialog-backdrop-background);
background: color-mix(
in sRGB,
var(--black) 25%,
var(--dialog-backdrop-background)
);
backdrop-filter: var(--dialog-backdrop-backdrop-filter);
animation: jenkins-dialog-backdrop-animate-in 0.15s;
}
@ -24,6 +30,7 @@ $jenkins-dialog-padding: 1.25rem;
padding: 0 $jenkins-dialog-padding;
color: var(--text-color);
overflow-wrap: anywhere;
text-box: cap alphabetic;
}
&__contents {
@ -31,27 +38,33 @@ $jenkins-dialog-padding: 1.25rem;
overflow-wrap: break-word;
padding: 0 $jenkins-dialog-padding;
max-height: 75vh;
font-size: 1rem;
font-size: $jenkins-dialog-font-size;
color: var(--text-color-secondary);
&--modal {
padding-bottom: $jenkins-dialog-padding;
color: var(--text-color);
}
.jenkins-dialog__buttons {
padding-inline: 0;
}
}
&__input {
display: flex;
flex-direction: column;
gap: 0.5rem;
padding: 0 $jenkins-dialog-padding 1rem;
padding: 0 $jenkins-dialog-padding;
color: var(--text-color-secondary);
}
&__buttons {
display: flex;
padding: 0 $jenkins-dialog-padding $jenkins-dialog-padding;
justify-content: right;
flex-direction: row-reverse;
gap: 1.25rem;
.jenkins-button {
min-width: 100px;
@ -74,6 +87,14 @@ $jenkins-dialog-padding: 1.25rem;
padding: 0;
border-radius: 100%;
}
&[closing] {
animation: jenkins-dialog-animate-out 0.1s linear;
&::backdrop {
animation: jenkins-dialog-backdrop-animate-out 0.1s linear;
}
}
}
@keyframes jenkins-dialog-backdrop-animate-in {
@ -94,3 +115,10 @@ $jenkins-dialog-padding: 1.25rem;
opacity: 0;
}
}
@keyframes jenkins-dialog-animate-out {
to {
scale: 95%;
opacity: 0;
}
}

1
src/main/scss/pages/_icon-legend.scss
View File

@ -23,7 +23,6 @@
dd {
margin: 0;
padding: 0;
font-size: 0.9375rem;
font-weight: var(--font-bold-weight);
line-height: 1.6;
}

2
war/pom.xml
View File

@ -653,7 +653,7 @@ THE SOFTWARE.
contains a version of Jetty that is older than this, trigger Dependabot in jenkinsci/winstone and release the
result before proceeding with the update here.
-->
<version>12.0.21</version>
<version>12.0.22</version>
<configuration>
<!--
Reload webapp when you hit ENTER. (See JETTY-282 for more)