Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge #2666 and #2668 from master to jetty 1.12.x branch #2674

Merged
merged 1 commit into from
Aug 6, 2024
Merged

merge #2666 and #2668 from master to jetty 1.12.x branch #2674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .github/workflows/pull-request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
run: mvn -B install

client-build:
runs-on: ubuntu-latest
runs-on: ubuntu-latest-4-cores
steps:
- name: Checkout repository
id: checkout
Expand Down
7,760 changes: 4,296 additions & 3,464 deletions ui/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

72 changes: 0 additions & 72 deletions ui/src/__tests__/components/denali/__snapshots__/Alert.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ exports[`Alert should disable animations 1`] = `
border-top: 4px solid #0066df;
box-sizing: border-box;
color: #303030;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-flex-flow: row nowrap;
-webkit-flex-flow: row nowrap;
Expand Down Expand Up @@ -76,9 +73,6 @@ exports[`Alert should disable animations 1`] = `
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-pack: center;
-ms-flex-pack: center;
Expand All @@ -87,9 +81,6 @@ exports[`Alert should disable animations 1`] = `
}

.emotion-1 .right-section {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex: 1 1 auto;
-ms-flex: 1 1 auto;
Expand All @@ -105,9 +96,6 @@ exports[`Alert should disable animations 1`] = `
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-flex-flow: row nowrap;
-webkit-flex-flow: row nowrap;
Expand Down Expand Up @@ -273,9 +261,6 @@ exports[`Alert should render all alert types 1`] = `
border-top: 4px solid #ea0000;
box-sizing: border-box;
color: #303030;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-flex-flow: row nowrap;
-webkit-flex-flow: row nowrap;
Expand Down Expand Up @@ -327,9 +312,6 @@ exports[`Alert should render all alert types 1`] = `
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-pack: center;
-ms-flex-pack: center;
Expand All @@ -338,9 +320,6 @@ exports[`Alert should render all alert types 1`] = `
}

.emotion-1 .right-section {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex: 1 1 auto;
-ms-flex: 1 1 auto;
Expand All @@ -356,9 +335,6 @@ exports[`Alert should render all alert types 1`] = `
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-flex-flow: row nowrap;
-webkit-flex-flow: row nowrap;
Expand Down Expand Up @@ -514,9 +490,6 @@ exports[`Alert should render all alert types 2`] = `
border-top: 4px solid #0066df;
box-sizing: border-box;
color: #303030;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-flex-flow: row nowrap;
-webkit-flex-flow: row nowrap;
Expand Down Expand Up @@ -568,9 +541,6 @@ exports[`Alert should render all alert types 2`] = `
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-pack: center;
-ms-flex-pack: center;
Expand All @@ -579,9 +549,6 @@ exports[`Alert should render all alert types 2`] = `
}

.emotion-1 .right-section {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex: 1 1 auto;
-ms-flex: 1 1 auto;
Expand All @@ -597,9 +564,6 @@ exports[`Alert should render all alert types 2`] = `
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-flex-flow: row nowrap;
-webkit-flex-flow: row nowrap;
Expand Down Expand Up @@ -755,9 +719,6 @@ exports[`Alert should render all alert types 3`] = `
border-top: 4px solid #15c046;
box-sizing: border-box;
color: #303030;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-flex-flow: row nowrap;
-webkit-flex-flow: row nowrap;
Expand Down Expand Up @@ -809,9 +770,6 @@ exports[`Alert should render all alert types 3`] = `
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-pack: center;
-ms-flex-pack: center;
Expand All @@ -820,9 +778,6 @@ exports[`Alert should render all alert types 3`] = `
}

.emotion-1 .right-section {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex: 1 1 auto;
-ms-flex: 1 1 auto;
Expand All @@ -838,9 +793,6 @@ exports[`Alert should render all alert types 3`] = `
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-flex-flow: row nowrap;
-webkit-flex-flow: row nowrap;
Expand Down Expand Up @@ -996,9 +948,6 @@ exports[`Alert should render all alert types 4`] = `
border-top: 4px solid #f4cb00;
box-sizing: border-box;
color: #303030;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-flex-flow: row nowrap;
-webkit-flex-flow: row nowrap;
Expand Down Expand Up @@ -1050,9 +999,6 @@ exports[`Alert should render all alert types 4`] = `
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-pack: center;
-ms-flex-pack: center;
Expand All @@ -1061,9 +1007,6 @@ exports[`Alert should render all alert types 4`] = `
}

.emotion-1 .right-section {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex: 1 1 auto;
-ms-flex: 1 1 auto;
Expand All @@ -1079,9 +1022,6 @@ exports[`Alert should render all alert types 4`] = `
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-flex-flow: row nowrap;
-webkit-flex-flow: row nowrap;
Expand Down Expand Up @@ -1237,9 +1177,6 @@ exports[`Alert should render open state 1`] = `
border-top: 4px solid #0066df;
box-sizing: border-box;
color: #303030;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-flex-flow: row nowrap;
-webkit-flex-flow: row nowrap;
Expand Down Expand Up @@ -1291,9 +1228,6 @@ exports[`Alert should render open state 1`] = `
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-pack: center;
-ms-flex-pack: center;
Expand All @@ -1302,9 +1236,6 @@ exports[`Alert should render open state 1`] = `
}

.emotion-1 .right-section {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex: 1 1 auto;
-ms-flex: 1 1 auto;
Expand All @@ -1320,9 +1251,6 @@ exports[`Alert should render open state 1`] = `
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-flex-flow: row nowrap;
-webkit-flex-flow: row nowrap;
Expand Down
21 changes: 7 additions & 14 deletions ui/src/__tests__/components/denali/__snapshots__/Button.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`Button should disable animations 1`] = `
.emotion-0 {
border: none;
border-radius: 2px;
box-shadow: 0 0 0 1px transparent inset,0 0 0 0 #d5d5d5 inset;
box-shadow: 0 0 0 1px #3697f2 inset;
box-sizing: border-box;
cursor: pointer;
display: inline-block;
Expand All @@ -21,7 +21,6 @@ exports[`Button should disable animations 1`] = `
vertical-align: baseline;
white-space: nowrap;
background: transparent;
box-shadow: 0 0 0 1px #3697f2 inset;
color: #3697f2;
}

Expand Down Expand Up @@ -369,7 +368,7 @@ exports[`Button should render a dark secondary active button 1`] = `
.emotion-0 {
border: none;
border-radius: 2px;
box-shadow: 0 0 0 1px transparent inset,0 0 0 0 #d5d5d5 inset;
box-shadow: 0 0 0 1px #3697f2 inset;
box-sizing: border-box;
cursor: pointer;
display: inline-block;
Expand All @@ -388,7 +387,6 @@ exports[`Button should render a dark secondary active button 1`] = `
vertical-align: baseline;
white-space: nowrap;
background: linear-gradient(to right, rgba(53,112,244,0.3), rgba(52,72,247,0.3));
box-shadow: 0 0 0 1px #3697f2 inset;
color: #fff;
}

Expand Down Expand Up @@ -421,7 +419,7 @@ exports[`Button should render a dark secondary button 1`] = `
.emotion-0 {
border: none;
border-radius: 2px;
box-shadow: 0 0 0 1px transparent inset,0 0 0 0 #d5d5d5 inset;
box-shadow: 0 0 0 1px #3697f2 inset;
box-sizing: border-box;
cursor: pointer;
display: inline-block;
Expand All @@ -440,7 +438,6 @@ exports[`Button should render a dark secondary button 1`] = `
vertical-align: baseline;
white-space: nowrap;
background: transparent;
box-shadow: 0 0 0 1px #3697f2 inset;
color: #fff;
}

Expand Down Expand Up @@ -473,7 +470,7 @@ exports[`Button should render a dark secondary disable button 1`] = `
.emotion-0 {
border: none;
border-radius: 2px;
box-shadow: 0 0 0 1px transparent inset,0 0 0 0 #d5d5d5 inset;
box-shadow: 0 0 0 1px #3697f2 inset;
box-sizing: border-box;
cursor: pointer;
display: inline-block;
Expand All @@ -492,7 +489,6 @@ exports[`Button should render a dark secondary disable button 1`] = `
vertical-align: baseline;
white-space: nowrap;
background: transparent;
box-shadow: 0 0 0 1px #3697f2 inset;
color: #fff;
}

Expand Down Expand Up @@ -693,7 +689,7 @@ exports[`Button should render a secondary active button 1`] = `
.emotion-0 {
border: none;
border-radius: 2px;
box-shadow: 0 0 0 1px transparent inset,0 0 0 0 #d5d5d5 inset;
box-shadow: 0 0 0 1px #3697f2 inset;
box-sizing: border-box;
cursor: pointer;
display: inline-block;
Expand All @@ -712,7 +708,6 @@ exports[`Button should render a secondary active button 1`] = `
vertical-align: baseline;
white-space: nowrap;
background: #d7e2fd;
box-shadow: 0 0 0 1px #3697f2 inset;
color: #3697f2;
}

Expand Down Expand Up @@ -745,7 +740,7 @@ exports[`Button should render a secondary button 1`] = `
.emotion-0 {
border: none;
border-radius: 2px;
box-shadow: 0 0 0 1px transparent inset,0 0 0 0 #d5d5d5 inset;
box-shadow: 0 0 0 1px #3697f2 inset;
box-sizing: border-box;
cursor: pointer;
display: inline-block;
Expand All @@ -764,7 +759,6 @@ exports[`Button should render a secondary button 1`] = `
vertical-align: baseline;
white-space: nowrap;
background: transparent;
box-shadow: 0 0 0 1px #3697f2 inset;
color: #3697f2;
}

Expand Down Expand Up @@ -797,7 +791,7 @@ exports[`Button should render a secondary disable button 1`] = `
.emotion-0 {
border: none;
border-radius: 2px;
box-shadow: 0 0 0 1px transparent inset,0 0 0 0 #d5d5d5 inset;
box-shadow: 0 0 0 1px #3697f2 inset;
box-sizing: border-box;
cursor: pointer;
display: inline-block;
Expand All @@ -816,7 +810,6 @@ exports[`Button should render a secondary disable button 1`] = `
vertical-align: baseline;
white-space: nowrap;
background: transparent;
box-shadow: 0 0 0 1px #3697f2 inset;
color: #3697f2;
}

Expand Down
Loading
Loading