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

[material-ui][Divider] Enable borderStyle enhancement in divider with children #42715

Merged
merged 13 commits into from
Jul 24, 2024
Merged

[material-ui][Divider] Enable borderStyle enhancement in divider with children #42715

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
45c9c7c
dashed border enhancement in divider
anuujj Jun 22, 2024
088f128
retrigger checks
anuujj Jun 22, 2024
bb2a912
test case added
anuujj Jul 8, 2024
102f536
dashed border enhancement in divider
anuujj Jun 22, 2024
166781f
retrigger checks
anuujj Jun 22, 2024
20ffdab
test case added
anuujj Jul 8, 2024
2fd81b7
test fixed
anuujj Jul 13, 2024
eff0d1e
test lint fix
anuujj Jul 13, 2024
7c4f0af
resolve conflict
ZeeshanTamboli Jul 13, 2024
89dcd02
fix test structure
ZeeshanTamboli Jul 13, 2024
8fa8ac8
add back before hook
ZeeshanTamboli Jul 13, 2024
c95a5c0
Trigger CI
DiegoAndai Jul 24, 2024
fe73d7f
Merge branch 'next' into dashed-border-divider
DiegoAndai Jul 24, 2024
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: 4 additions & 0 deletions packages/mui-material/src/Divider/Divider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ const DividerRoot = styled('div', {
whiteSpace: 'nowrap',
textAlign: 'center',
border: 0,
borderTopStyle: 'solid',
DiegoAndai marked this conversation as resolved.
Show resolved Hide resolved
borderLeftStyle: 'solid',
'&::before, &::after': {
content: '""',
alignSelf: 'center',
Expand All @@ -149,6 +151,7 @@ const DividerRoot = styled('div', {
'&::before, &::after': {
width: '100%',
borderTop: `thin solid ${(theme.vars || theme).palette.divider}`,
borderTopStyle: 'inherit',
},
},
},
Expand All @@ -159,6 +162,7 @@ const DividerRoot = styled('div', {
'&::before, &::after': {
height: '100%',
borderLeft: `thin solid ${(theme.vars || theme).palette.divider}`,
borderLeftStyle: 'inherit',
},
},
},
Expand Down
Loading