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

[CardContent] Use theme.spacing() instead of hardcoded values #32471

Open
wants to merge 8 commits into
base: v5.x
Choose a base branch
from
Open

[CardContent] Use theme.spacing() instead of hardcoded values #32471

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2bb3e3b
[Text Field] Fix InputLabelProps={{ required: true }} renders incorre…
MahmoudMans Mar 26, 2022
b4c45bc
Merge branch 'mui:master' into master
MahmoudMans Apr 10, 2022
510710c
Merge branch 'mui:master' into master
MahmoudMans Apr 26, 2022
c350ca7
change hardcoded padding to themespacing in cardContent
MahmoudMans Apr 26, 2022
b9b4735
change hardcoded padding to themespacing in cardcontent
MahmoudMans May 14, 2022
12afae7
change hardcoded padding to themespacing in cardcontent
MahmoudMans May 14, 2022
d37bcfa
Update packages/mui-material/src/InputLabel/InputLabel.js
mnajdova Dec 23, 2022
75b6f72
Apply suggestions from code review
mnajdova Dec 23, 2022
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
4 changes: 2 additions & 2 deletions packages/mui-material/src/CardContent/CardContent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ const CardContentRoot = styled('div', {
overridesResolver: (props, styles) => styles.root,
})(() => {
mnajdova marked this conversation as resolved.
Show resolved Hide resolved
return {
padding: 16,
padding: styled.theme.spacing(2),
Copy link
Member

Choose a reason for hiding this comment

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

TypeError: Cannot read property 'spacing' of undefined

Copy link
Member

Choose a reason for hiding this comment

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

It should be

})(({ theme }) => {
  return {
    padding: theme.spacing(2),

mnajdova marked this conversation as resolved.
Show resolved Hide resolved
'&:last-child': {
paddingBottom: 24,
paddingBottom: styled.theme.spacing(3),
mnajdova marked this conversation as resolved.
Show resolved Hide resolved
},
};
});
Expand Down
4 changes: 2 additions & 2 deletions packages/mui-material/src/InputLabel/InputLabel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ const InputLabelRoot = styled(FormLabel, {
...(ownerState.shrink && {
userSelect: 'none',
pointerEvents: 'auto',
maxWidth: 'calc(133% - 24px)',
transform: 'translate(14px, -9px) scale(0.75)',
maxWidth: 'calc(150% - 24px)',
transform: 'translate(12px, -9px) scale(0.70)',
Copy link
Member

Choose a reason for hiding this comment

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

Why this change? Let's not change this.

Copy link
Author

Choose a reason for hiding this comment

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

@ZeeshanTamboli sorry this changes were related to another pull request

mnajdova marked this conversation as resolved.
Show resolved Hide resolved
}),
}),
}));
Expand Down