Merge branch 'develop' into dayana

1 files changed, 7 insertions, 7 deletions

diff --git a/front/odiparpack/app/components/Sidebar/Sidebar.js b/front/odiparpack/app/components/Sidebar/Sidebar.js
index 01de4ec..b4f5626 100644
--- a/front/odiparpack/app/components/Sidebar/Sidebar.js
+++ b/front/odiparpack/app/components/Sidebar/Sidebar.js
@@ -4,10 +4,10 @@ import { withStyles } from '@material-ui/core/styles';
 import classNames from 'classnames';
 import brand from 'ba-api/brand';
 import dummy from 'ba-api/dummyContents';
-import logo from 'ba-images/logo.svg';
-import { Hidden, Drawer, SwipeableDrawer, List, Divider, Avatar } from '@material-ui/core';
-import MainMenu from './MainMenu';
-import OtherMenu from './OtherMenu';
+import logo from 'ba-images/logo.png';
+import { Hidden, Drawer, SwipeableDrawer, Avatar } from '@material-ui/core';
+import MainMenuSimple from './MainMenuSimple';
+//import OtherMenu from './OtherMenu';
 import styles from './sidebar-jss';
 
 const MenuContent = props => {
@@ -38,11 +38,11 @@ const MenuContent = props => {
         </div>
       </div>
       <div className={classes.menuContainer}>
-        <MainMenu loadTransition={loadTransition} toggleDrawerOpen={toggleDrawerOpen} />
-        <Divider className={classes.divider} />
+        <MainMenuSimple loadTransition={loadTransition} toggleDrawerOpen={toggleDrawerOpen} />
+        {/* <Divider className={classes.divider} />
         <List>
           <OtherMenu toggleDrawerOpen={toggleDrawerOpen} />
-        </List>
+        </List> */}
       </div>
     </div>
   );