Skip to content

Commit

Permalink
Merge pull request #10985 from captain-Akshay/captain/fullv2
Browse files Browse the repository at this point in the history
responsive v1
  • Loading branch information
leecalcote committed May 17, 2024
2 parents 459b41c + 21e7c09 commit d69f67c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ui/components/Navigator.js
Original file line number Diff line number Diff line change
Expand Up @@ -1397,7 +1397,7 @@ class Navigator extends React.Component {
classes={{
paper: isDrawerCollapsed ? classes.sidebarCollapsed : classes.sidebarExpanded,
}}
style={{ width: 'inherit' }}
style={{ height: '100%' }}
>
{Title}
{Menu}
Expand Down
1 change: 1 addition & 0 deletions ui/pages/_app.js
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,7 @@ class MesheryApp extends App {
<nav
className={isDrawerCollapsed ? classes.drawerCollapsed : classes.drawer}
data-test="navigation"
style={{ height: '100%', overflow: 'visible' }}
>
<Hidden smUp implementation="js">
<Navigator
Expand Down
10 changes: 9 additions & 1 deletion ui/themes/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,7 @@ export const styles = (theme) => ({
root: {
display: 'flex',
minHeight: '100vh',
height: '100vh',
},
drawer: {
[theme.breakpoints.up('sm')]: {
Expand All @@ -601,14 +602,21 @@ export const styles = (theme) => ({
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.enteringScreen,
}),
'& > div:first-child': {
height: 'inherit',
width: 'inherit',
},
},
drawerCollapsed: {
[theme.breakpoints.up('sm')]: { width: theme.spacing(8.4) + 1 },
transition: theme.transitions.create('width', {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen,
}),
overflowX: 'hidden',
'& > div:first-child': {
height: 'inherit',
width: 'inherit',
},
},
appContent: {
flex: 1,
Expand Down

0 comments on commit d69f67c

Please sign in to comment.