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

[docs-infra] Add demo container design refinements #41948

Merged
merged 3 commits into from Apr 18, 2024
Merged

[docs-infra] Add demo container design refinements #41948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1fdb76
revise the JS/TS toggle button styles
danilo-leal Apr 17, 2024
a4455cc
small demo container style improvements
danilo-leal Apr 17, 2024
ed5a534
fix lint: remove unused import
danilo-leal Apr 17, 2024
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
1 change: 0 additions & 1 deletion docs/src/modules/components/Demo.js
View file
Open in desktop
Expand Up @@ -239,7 +239,6 @@ const DemoRootMaterial = styled('div', {
borderRightWidth: 0,
...theme.applyDarkStyles({
backgroundColor: alpha(theme.palette.primaryDark[700], 0.1),
borderBottom: 0,
}),
}),
/* Similar to the outlined one but without padding. Ideal for playground demos. */
Expand Down
38 changes: 9 additions & 29 deletions docs/src/modules/components/DemoToolbar.js
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ import CheckIcon from '@mui/icons-material/Check';
import Fade from '@mui/material/Fade';
import MDButton from '@mui/material/Button';
import Box from '@mui/material/Box';
import MDToggleButton, { toggleButtonClasses } from '@mui/material/ToggleButton';
import MDToggleButton from '@mui/material/ToggleButton';
import MDToggleButtonGroup, { toggleButtonGroupClasses } from '@mui/material/ToggleButtonGroup';
import SvgIcon from '@mui/material/SvgIcon';
import Snackbar from '@mui/material/Snackbar';
Expand Down Expand Up @@ -69,23 +69,18 @@ const ToggleButtonGroup = styled(MDToggleButtonGroup)(({ theme }) => [
theme.unstable_sx({
[`& .${toggleButtonGroupClasses.grouped}`]: {
'&:not(:first-of-type)': {
marginLeft: 0.8,
borderLeft: '1px solid',
borderLeftColor: 'divider',
borderTopLeftRadius: 999,
borderBottomLeftRadius: 999,
pr: '2px', // a nudge for optical alignment
},
'&:not(:last-of-type)': {
borderTopRightRadius: 999,
borderBottomRightRadius: 999,
pl: '2px', // a nudge for optical alignment
},
},
}),
]);

const Button = styled(MDButton)(({ theme }) => ({
height: 26,
padding: '6px 8px',
padding: '6px 8px 8px 8px',
flexShrink: 0,
borderRadius: 999,
border: '1px solid',
Expand Down Expand Up @@ -131,29 +126,14 @@ const MenuItem = styled(MDMenuItem)(({ theme }) => ({
const ToggleButton = styled(MDToggleButton)(({ theme }) => [
theme.unstable_sx({
height: 26,
padding: theme.spacing(0, 1, 0.1, 1),
width: 38,
p: 0,
fontSize: theme.typography.pxToRem(13),
borderColor: 'grey.200',
borderRadius: '999px',
'&.Mui-disabled': {
opacity: 0.5,
opacity: 0.8,
cursor: 'not-allowed',
},
[`&.${toggleButtonClasses.selected}:hover`]: {
backgroundColor: theme.vars
? `rgba(${theme.vars.palette.primary.mainChannel} / calc(${theme.vars.palette.action.selectedOpacity} + ${theme.vars.palette.action.hoverOpacity}))`
: alpha(
theme.palette.primary.main,
theme.palette.action.selectedOpacity + theme.palette.action.hoverOpacity,
),
'@media (hover: none)': {
backgroundColor: theme.vars
? `rgba(${theme.vars.palette.primary.mainChannel} / ${theme.vars.palette.action.selectedOpacity})`
: alpha(theme.palette.primary.main, theme.palette.action.selectedOpacity),
},
},
}),
theme.applyDarkStyles({
borderColor: theme.palette.primaryDark[700],
}),
]);

Expand Down Expand Up @@ -526,7 +506,7 @@ export default function DemoToolbar(props) {
</Button>
)}
<Fade in={codeOpen}>
<Box sx={{ display: 'flex', height: 40 }}>
<Box sx={{ display: 'flex' }}>
{hasNonSystemDemos && (
<Divider orientation="vertical" variant="middle" sx={{ mx: 1, height: '24px' }} />
)}
Expand Down
1 change: 1 addition & 0 deletions docs/src/modules/components/DemoToolbarRoot.ts
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@ const DemoToolbarRoot = styled('div', {
display: 'none',
[theme.breakpoints.up('sm')]: {
top: 0,
maxHeight: 50,
display: 'block',
marginTop: demoOptions.bg === 'inline' ? theme.spacing(1) : -1,
padding: theme.spacing(0.5, 1),
Expand Down
2 changes: 1 addition & 1 deletion docs/src/modules/components/HighlightedCodeWithTabs.tsx
View file
Open in desktop
Expand Up @@ -48,7 +48,7 @@ export const CodeTab = styled(TabBase)<{ ownerState: { mounted: boolean; contain
({ theme, ownerState }) =>
theme.unstable_sx({
height: 26,
p: '0 8px',
p: '0 8px 2px 8px',
border: ownerState?.contained ? '1px solid transparent' : 'none',
bgcolor: 'transparent',
color: ownerState?.contained
Expand Down