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

[TextField] Fix conflict with Bootstrap even when label is not defined #34343

Merged
merged 4 commits into from Sep 19, 2022
Merged

[TextField] Fix conflict with Bootstrap even when label is not defined #34343

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
936e01c
fix conflict with bootstrap even when label is not defined
ZeeshanTamboli Sep 17, 2022
113a7cc
Merge branch 'master' into issue/34298-textfield-legend-style-bootstrap
ZeeshanTamboli Sep 19, 2022
4896850
run CI
ZeeshanTamboli Sep 19, 2022
666d5db
Restart CI
michaldudak Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/mui-material/src/OutlinedInput/NotchedOutline.js
View file
Open in desktop
Expand Up @@ -21,6 +21,7 @@ const NotchedOutlineRoot = styled('fieldset')({

const NotchedOutlineLegend = styled('legend')(({ ownerState, theme }) => ({
float: 'unset', // Fix conflict with bootstrap
width: 'auto', // Fix conflict with bootstrap
overflow: 'hidden', // Fix Horizontal scroll when label too long
...(!ownerState.withLabel && {
padding: 0,
Expand All @@ -32,7 +33,6 @@ const NotchedOutlineLegend = styled('legend')(({ ownerState, theme }) => ({
}),
...(ownerState.withLabel && {
display: 'block', // Fix conflict with normalize.css and sanitize.css
width: 'auto', // Fix conflict with bootstrap
padding: 0,
height: 11, // sync with `lineHeight` in `legend` styles
fontSize: '0.75em',
Expand Down