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.

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

DEP Upgrade bootstrap and reactstrap #1308

Merged

Conversation

GuySartorelli
Copy link
Member

@GuySartorelli GuySartorelli commented Jan 21, 2025

See silverstripe/silverstripe-admin#1889 which links to the specific upgrade guide entries for most changes made.

Upgrade docs

Issue

@GuySartorelli GuySartorelli force-pushed the pulls/6.0/upgrade-bootstrap branch from 7e7b26d to 3d0c764 Compare January 22, 2025 01:47
@GuySartorelli GuySartorelli marked this pull request as ready for review January 23, 2025 00:02
max-width: 900px;
width: 900px;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The bootstrap styling changed to using width instead of max-width so this needed to be changed to match

Comment on lines -8 to -23
// Fixes issue when rendering reactstrap tooltip
// Warning: `NaN` is an invalid value for the `left` css style property.
// https://stackoverflow.com/a/70157330
// Have refactored to not use an anonymous class with a static property being assigned
// so that it passed eslint
jest.mock('popper.js', () => {
const PopperJS = jest.requireActual('popper.js');
return {
__esModule: true,
default: jest.fn(() => ({
placements: PopperJS.placements,
destroy: () => {},
scheduleUpdate: () => {},
})),
};
});
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No longer needed

Comment on lines +6 to +8
.form-label {
margin-bottom: 0;
}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Counteracts bootstrap adding a margin for this which broke the "display title?" checkbox styling.

@emteknetnz emteknetnz merged commit 07d4a5d into silverstripe:6.0 Jan 26, 2025
22 of 25 checks passed
@emteknetnz emteknetnz deleted the pulls/6.0/upgrade-bootstrap branch January 26, 2025 22:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants