Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/8.4' into 9.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	Build/Jenkins/update-neos-ui-compiled.sh
  • Loading branch information
markusguenther committed Dec 16, 2023
2 parents ea4044c + aa84e84 commit 112813d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ test:

## Executes integration tests on saucelabs.
test-e2e-saucelabs:
bash Tests/IntegrationTests/e2e.sh "saucelabs:chrome:Windows 10"
bash Tests/IntegrationTests/e2e.sh "saucelabs:Firefox@latest:Windows 10"

## Executes integration tests locally.
test-e2e:
Expand Down
4 changes: 2 additions & 2 deletions packages/react-ui-components/src/Tree/node.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
composes: reset from '../reset.module.css';
position: relative;
display: inline-block;
min-width: 100%;
width: 100%;
padding: .1em 0;

border-left: 2px solid transparent;
Expand Down Expand Up @@ -89,7 +89,7 @@
}

.header__labelWrapper {
max-width: 264px;
max-width: 100%;
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
Expand Down

0 comments on commit 112813d

Please sign in to comment.