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

[material-ui][Slider] Fix customized iOS demo to use updated official colors #39813

Merged
merged 9 commits into from
Dec 28, 2023
Merged

[material-ui][Slider] Fix customized iOS demo to use updated official colors #39813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
50e622b
FIX: Removed unnecessary condition
Super-Kenil Nov 9, 2023
f60570d
FIX: IOSSlider now uses latest official colors
Super-Kenil Nov 9, 2023
08c08bc
Merge branch 'mui:master' into fixing-docs
Super-Kenil Nov 28, 2023
f6543e8
Merge branch 'mui:master' into fixing-docs
Super-Kenil Dec 1, 2023
4b97fb7
Merge branch 'mui:master' into fixing-docs
Super-Kenil Dec 4, 2023
b8e4dfa
FEAT: updated iOS slider to latest design
Super-Kenil Dec 23, 2023
93170b4
FIX: typo
Super-Kenil Dec 23, 2023
9e7b201
FIX: code formatting
Super-Kenil Dec 26, 2023
a07f957
Merge branch 'mui:master' into fixing-docs
Super-Kenil Dec 26, 2023
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
52 changes: 14 additions & 38 deletions docs/data/material/components/slider/CustomizedSlider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,38 +24,26 @@ ValueLabelComponent.propTypes = {
const iOSBoxShadow =
'0 3px 1px rgba(0,0,0,0.1),0 4px 8px rgba(0,0,0,0.13),0 0 0 1px rgba(0,0,0,0.02)';

const marks = [
{
value: 0,
},
{
value: 20,
},
{
value: 37,
},
{
value: 100,
},
];

const IOSSlider = styled(Slider)(({ theme }) => ({
color: theme.palette.mode === 'dark' ? '#3880ff' : '#3880ff',
height: 2,
color: theme.palette.mode === 'dark' ? '#0a84ff' : '#007bff',
height: 5,
padding: '15px 0',
'& .MuiSlider-thumb': {
height: 28,
width: 28,
height: 20,
width: 20,
backgroundColor: '#fff',
boxShadow: iOSBoxShadow,
boxShadow: '0 0 2px 0px rgba(0, 0, 0, 0.1)',
'&:focus, &:hover, &.Mui-active': {
boxShadow:
'0 3px 1px rgba(0,0,0,0.1),0 4px 8px rgba(0,0,0,0.3),0 0 0 1px rgba(0,0,0,0.02)',
boxShadow: '0px 0px 3px 1px rgba(0, 0, 0, 0.1)',
// Reset on touch devices, it doesn't add specificity
'@media (hover: none)': {
boxShadow: iOSBoxShadow,
},
},
'&:before': {
boxShadow:
'0px 0px 1px 0px rgba(0,0,0,0.2), 0px 0px 0px 0px rgba(0,0,0,0.14), 0px 0px 1px 0px rgba(0,0,0,0.12)',
},
},
'& .MuiSlider-valueLabel': {
fontSize: 12,
Expand All @@ -73,19 +61,12 @@ const IOSSlider = styled(Slider)(({ theme }) => ({
},
'& .MuiSlider-track': {
border: 'none',
height: 5,
},
'& .MuiSlider-rail': {
opacity: 0.5,
backgroundColor: '#bfbfbf',
},
'& .MuiSlider-mark': {
backgroundColor: '#bfbfbf',
height: 8,
width: 1,
'&.MuiSlider-markActive': {
opacity: 1,
backgroundColor: 'currentColor',
},
boxShadow: 'inset 0px 0px 4px -2px #000',
backgroundColor: '#d0d0d0',
},
}));

Expand Down Expand Up @@ -178,12 +159,7 @@ export default function CustomizedSlider() {
return (
<Box sx={{ width: 320 }}>
<Typography gutterBottom>iOS</Typography>
<IOSSlider
aria-label="ios slider"
defaultValue={60}
marks={marks}
valueLabelDisplay="on"
/>
<IOSSlider aria-label="ios slider" defaultValue={60} valueLabelDisplay="on" />
<Box sx={{ m: 3 }} />
<Typography gutterBottom>pretto.fr</Typography>
<PrettoSlider
Expand Down
52 changes: 14 additions & 38 deletions docs/data/material/components/slider/CustomizedSlider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,38 +18,26 @@ function ValueLabelComponent(props: SliderValueLabelProps) {
const iOSBoxShadow =
'0 3px 1px rgba(0,0,0,0.1),0 4px 8px rgba(0,0,0,0.13),0 0 0 1px rgba(0,0,0,0.02)';

const marks = [
{
value: 0,
},
{
value: 20,
},
{
value: 37,
},
{
value: 100,
},
];

const IOSSlider = styled(Slider)(({ theme }) => ({
color: theme.palette.mode === 'dark' ? '#3880ff' : '#3880ff',
height: 2,
color: theme.palette.mode === 'dark' ? '#0a84ff' : '#007bff',
height: 5,
padding: '15px 0',
'& .MuiSlider-thumb': {
height: 28,
width: 28,
height: 20,
width: 20,
backgroundColor: '#fff',
boxShadow: iOSBoxShadow,
boxShadow: '0 0 2px 0px rgba(0, 0, 0, 0.1)',
'&:focus, &:hover, &.Mui-active': {
boxShadow:
'0 3px 1px rgba(0,0,0,0.1),0 4px 8px rgba(0,0,0,0.3),0 0 0 1px rgba(0,0,0,0.02)',
boxShadow: '0px 0px 3px 1px rgba(0, 0, 0, 0.1)',
// Reset on touch devices, it doesn't add specificity
'@media (hover: none)': {
boxShadow: iOSBoxShadow,
},
},
'&:before': {
boxShadow:
'0px 0px 1px 0px rgba(0,0,0,0.2), 0px 0px 0px 0px rgba(0,0,0,0.14), 0px 0px 1px 0px rgba(0,0,0,0.12)',
},
},
'& .MuiSlider-valueLabel': {
fontSize: 12,
Expand All @@ -67,19 +55,12 @@ const IOSSlider = styled(Slider)(({ theme }) => ({
},
'& .MuiSlider-track': {
border: 'none',
height: 5,
},
'& .MuiSlider-rail': {
opacity: 0.5,
backgroundColor: '#bfbfbf',
},
'& .MuiSlider-mark': {
backgroundColor: '#bfbfbf',
height: 8,
width: 1,
'&.MuiSlider-markActive': {
opacity: 1,
backgroundColor: 'currentColor',
},
boxShadow: 'inset 0px 0px 4px -2px #000',
backgroundColor: '#d0d0d0',
},
}));

Expand Down Expand Up @@ -170,12 +151,7 @@ export default function CustomizedSlider() {
return (
<Box sx={{ width: 320 }}>
<Typography gutterBottom>iOS</Typography>
<IOSSlider
aria-label="ios slider"
defaultValue={60}
marks={marks}
valueLabelDisplay="on"
/>
<IOSSlider aria-label="ios slider" defaultValue={60} valueLabelDisplay="on" />
<Box sx={{ m: 3 }} />
<Typography gutterBottom>pretto.fr</Typography>
<PrettoSlider
Expand Down