Skip to content

Commit

Permalink
MUI Dialog mobile styling adaptions (#3144)
Browse files Browse the repository at this point in the history
Co-authored-by: Ricky James Smith <[email protected]>
Co-authored-by: Johannes Obermair <[email protected]>
  • Loading branch information
3 people authored Jan 20, 2025
1 parent 4b008b9 commit 47be4eb
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 7 deletions.
5 changes: 5 additions & 0 deletions .changeset/eighty-zebras-rescue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@comet/admin-theme": patch
---

Adapt styling of `DialogActions`, `DialogContent`, and `DialogTitle` to match the Comet DXP design
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
import { mergeOverrideStyles } from "../utils/mergeOverrideStyles";
import { GetMuiComponentTheme } from "./getComponentsTheme";

export const getMuiDialogActions: GetMuiComponentTheme<"MuiDialogActions"> = (component, { palette }) => ({
export const getMuiDialogActions: GetMuiComponentTheme<"MuiDialogActions"> = (component, { palette, breakpoints, spacing }) => ({
...component,
styleOverrides: mergeOverrideStyles<"MuiDialogActions">(component?.styleOverrides, {
root: {
borderTop: `1px solid ${palette.grey[100]}`,
padding: 20,
padding: spacing(2),
justifyContent: "space-between",

[breakpoints.up("sm")]: {
padding: spacing(4),
},

"&>:first-of-type:last-child": {
marginLeft: "auto",
},
Expand Down
14 changes: 11 additions & 3 deletions packages/admin/admin-theme/src/componentsTheme/MuiDialogContent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,23 @@ import { dialogTitleClasses } from "@mui/material";
import { mergeOverrideStyles } from "../utils/mergeOverrideStyles";
import { GetMuiComponentTheme } from "./getComponentsTheme";

export const getMuiDialogContent: GetMuiComponentTheme<"MuiDialogContent"> = (component, { palette }) => ({
export const getMuiDialogContent: GetMuiComponentTheme<"MuiDialogContent"> = (component, { palette, breakpoints, spacing }) => ({
...component,
styleOverrides: mergeOverrideStyles<"MuiDialogContent">(component?.styleOverrides, {
root: {
backgroundColor: palette.grey[50],
padding: 40,
padding: spacing(2),

[`.${dialogTitleClasses.root} + &`]: {
paddingTop: 40,
paddingTop: spacing(2),
},

[breakpoints.up("sm")]: {
padding: spacing(8),

[`.${dialogTitleClasses.root} + &`]: {
paddingTop: spacing(8),
},
},
},
}),
Expand Down
11 changes: 9 additions & 2 deletions packages/admin/admin-theme/src/componentsTheme/MuiDialogTitle.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { mergeOverrideStyles } from "../utils/mergeOverrideStyles";
import { GetMuiComponentTheme } from "./getComponentsTheme";

export const getMuiDialogTitle: GetMuiComponentTheme<"MuiDialogTitle"> = (component, { palette, typography }) => ({
export const getMuiDialogTitle: GetMuiComponentTheme<"MuiDialogTitle"> = (component, { palette, typography, breakpoints, spacing }) => ({
...component,
defaultProps: {
variant: "subtitle1",
Expand All @@ -10,7 +10,14 @@ export const getMuiDialogTitle: GetMuiComponentTheme<"MuiDialogTitle"> = (compon
root: {
backgroundColor: palette.grey["A200"],
color: "#ffffff",
padding: 20,
padding: spacing(2),
fontSize: "14px",

[breakpoints.up("sm")]: {
minWidth: 0,
fontSize: "16px",
padding: spacing(4),
},
},
}),
});

0 comments on commit 47be4eb

Please sign in to comment.