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

Fix alignment issues in API Details left menu #773

Merged
merged 1 commit into from
Oct 7, 2024
Merged

Fix alignment issues in API Details left menu #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
104 changes: 94 additions & 10 deletions portals/devportal/src/main/webapp/source/src/app/components/Apis/Details/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ const classes = {
leftMenuVerticalLeft: `${PREFIX}-leftMenuVerticalLeft`,
leftMenuVerticalLeftMinView: `${PREFIX}-leftMenuVerticalLeftMinView`,
leftMenuVerticalRight: `${PREFIX}-leftMenuVerticalRight`,
leftMenuVerticalRightMinView: `${PREFIX}-leftMenuVerticalRightMinView`,
leftLInkMain: `${PREFIX}-leftLInkMain`,
leftLInkMainText: `${PREFIX}-leftLInkMainText`,
detailsContent: `${PREFIX}-detailsContent`,
Expand All @@ -125,7 +126,13 @@ const classes = {
shiftLeft: `${PREFIX}-shiftLeft`,
contentLoader: `${PREFIX}-contentLoader`,
contentLoaderRightMenu: `${PREFIX}-contentLoaderRightMenu`,
expandIconColor: `${PREFIX}-expandIconColor`,
expandIcon: `${PREFIX}-expandIcon`,
expandIconMinView: `${PREFIX}-expandIconMinView`,
accordianSummary: `${PREFIX}-accordianSummary`,
accordianSummaryMinView: `${PREFIX}-accordianSummaryMinView`,
accordionDetails: `${PREFIX}-accordionDetails`,
accordionDetailsMinView: `${PREFIX}-accordionDetailsMinView`,
leftMenuVerticalRightDrawerIcon: `${PREFIX}-leftMenuVerticalRightDrawerIcon`,
};

const Root = styled('div')((
Expand Down Expand Up @@ -158,7 +165,7 @@ const Root = styled('div')((
[`& .${classes.leftMenuHorizontal}`]: {
top: theme.custom.infoBar.height,
overflowX: 'auto',
height: 60,
position: 'static',
display: 'flex',
left: 0,
},
Expand All @@ -172,13 +179,22 @@ const Root = styled('div')((
overflowY: 'auto',
},
[`& .${classes.leftMenuVerticalLeftMinView}`]: {
width: 45,
width: 50,
top: 0,
left: 0,
overflowY: 'auto',
},
[`& .${classes.leftMenuVerticalRight}`]: {
width: theme.custom.leftMenu.width,
[theme.breakpoints.down('md')]: {
width: 50,
},
top: 0,
right: 0,
overflowY: 'auto',
},
[`& .${classes.leftMenuVerticalRightMinView}`]: {
width: 50,
top: 0,
right: 0,
overflowY: 'auto',
Expand Down Expand Up @@ -238,8 +254,39 @@ const Root = styled('div')((
[`& .${classes.contentLoaderRightMenu}`]: {
paddingRight: theme.custom.leftMenu.width,
},
[`& .${classes.expandIconColor}`]: {
[`& .${classes.expandIcon}`]: {
color: '#ffffff',
[theme.breakpoints.down('md')]: {
display: 'none',
},
},
[`& .${classes.expandIconMinView}`]: {
display: 'none',
},
[`& .${classes.accordianSummary}`]: {
padding: '0 12px 0 5px',
[theme.breakpoints.down('md')]: {
padding: 0,
},
},
[`& .${classes.accordianSummaryMinView}`]: {
padding: 0,
},
[`& .${classes.accordionDetails}`]: {
paddingTop: 0,
paddingBottom: 0,
margin: 0,
[theme.breakpoints.down('md')]: {
paddingLeft: 0,
paddingRight: 0,
},
},
[`& .${classes.accordionDetailsMinView}`]: {
paddingLeft: 0,
paddingRight: 0,
},
[`& .${classes.leftMenuVerticalRightDrawerIcon}`]: {
transform: 'rotate(180deg)',
},
};
});
Expand Down Expand Up @@ -516,7 +563,8 @@ class DetailsLegacy extends React.Component {

},
{
[classes.leftMenuVerticalRight]: position === 'vertical-right',
[classes.leftMenuVerticalRight]: position === 'vertical-right' && open,
[classes.leftMenuVerticalRightMinView]: position === 'vertical-right' && !open,
},
'left-menu',
)}
Expand Down Expand Up @@ -569,8 +617,19 @@ class DetailsLegacy extends React.Component {
onChange={(_event, expanded) => this.setState({ tryOutExpanded: expanded })}
>
<AccordionSummary
expandIcon={<ExpandMoreIcon className={classes.expandIconColor} />}
style={{ padding: '0 12px 0 5px', maxHeight: 43, minHeight: 43 }}
expandIcon={(
<ExpandMoreIcon
className={classNames(
classes.expandIcon,
{ [classes.expandIconMinView]: !open },
)}
/>
)}
style={{ maxHeight: 43, minHeight: 43 }}
className={classNames(
classes.accordianSummary,
{ [classes.accordianSummaryMinView]: !open },
)}
>
<LeftMenuItem
text={(
Expand All @@ -585,7 +644,12 @@ class DetailsLegacy extends React.Component {
/>
</AccordionSummary>
<AccordionDetails
style={{ paddingTop: 0, paddingBottom: 0, margin: 0 }}
className={
classNames(
classes.accordionDetails,
{ [classes.accordionDetailsMinView]: !open },
)
}
>
<div>
<LeftMenuItem
Expand Down Expand Up @@ -704,7 +768,17 @@ class DetailsLegacy extends React.Component {
width: 100, paddingLeft: '15px', position: 'absolute', bottom: 0, cursor: 'pointer',
}}
>
<ArrowBackIosIcon fontSize='medium' style={{ color: 'white' }} />
<ArrowBackIosIcon
fontSize='medium'
style={{ color: 'white' }}
className={
classNames(
{
[classes.leftMenuVerticalRightDrawerIcon]: position === 'vertical-right',
},
)
}
/>
</div>
) : (
<div
Expand All @@ -714,7 +788,17 @@ class DetailsLegacy extends React.Component {
paddingLeft: '15px', position: 'absolute', bottom: 0, cursor: 'pointer',
}}
>
<ArrowForwardIosIcon fontSize='medium' style={{ color: 'white' }} />
<ArrowForwardIosIcon
fontSize='medium'
style={{ color: 'white' }}
className={
classNames(
{
[classes.leftMenuVerticalRightDrawerIcon]: position === 'vertical-right',
},
)
}
/>
</div>

)}
Expand Down
3 changes: 3 additions & 0 deletions portals/devportal/src/main/webapp/source/src/app/components/Applications/Details/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ const Root = styled('div')((
top: 0,
right: 0,
overflowY: 'auto',
[theme.breakpoints.down('md')]: {
width: 50,
},
},

[`& .${classes.leftLInkMain}`]: {
Expand Down
6 changes: 2 additions & 4 deletions portals/devportal/src/main/webapp/source/src/app/components/Shared/LeftMenuItem.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,6 @@ const StyledBootstrapTooltip = styled(BootstrapTooltip)((
paddingBottom: theme.spacing(0.6),
paddingLeft: theme.spacing(1),
paddingRight: theme.spacing(1),
[theme.breakpoints.down('md')]: {
paddingLeft: 0,
},
fontSize: theme.typography.caption.fontSize,
cursor: 'pointer',
textDecoration: 'none',
Expand Down Expand Up @@ -250,8 +247,9 @@ function LeftMenuItem(props) {
className={classNames(
{
[classes.leftLInkText_IconLeft]: leftMenu.style === 'icon left',
[classes.leftLInkText_NoText]: leftMenu.style === 'no text',
},
classes.leftLInkText_NoTextWhenSmall,
classes.leftLInkText_NoText,
'leftLInkText',
)}
/>
Expand Down
Loading