Skip to content

Commit

Permalink
Merge pull request #334 from shesha-io/feat/ps/sidebar-clean-up
Browse files Browse the repository at this point in the history
Feat : clean up sidebar
  • Loading branch information
pholoshos committed Jun 23, 2023
2 parents 4436583 + 7eff6fe commit f06b203
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
6 changes: 4 additions & 2 deletions shesha-reactjs/src/components/mainLayout/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export interface IMainLayoutProps extends IHtmlHeadProps {
headerControls?: ReactNodeOrFunc;
}

const DefaultLayout: FC<PropsWithChildren<IMainLayoutProps>> = props => {
const DefaultLayout: FC<PropsWithChildren<IMainLayoutProps>> = (props) => {
const {
title,
// description,
Expand Down Expand Up @@ -132,7 +132,8 @@ const DefaultLayout: FC<PropsWithChildren<IMainLayoutProps>> = props => {
onCollapse={setCollapsed}
trigger={<MenuTrigger collapsed={collapsed} />}
style={{
overflow: 'auto',
overflowX: 'hidden',
scrollbarWidth: 'thin',
height: '100vh',
position: 'fixed',
paddingTop: '48px',
Expand All @@ -147,6 +148,7 @@ const DefaultLayout: FC<PropsWithChildren<IMainLayoutProps>> = props => {
defaultSettings={sidebarDefaults}
/>
</Sider>

<Layout className="site-layout">
<Header className="site-layout-background" style={headerStyle}>
<LayoutHeader collapsed={collapsed} customComponent={customComponent} />
Expand Down
10 changes: 10 additions & 0 deletions shesha-reactjs/src/components/mainLayout/styles/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@
margin-left: @sha-sider-collapsed-width;
}
}
::-webkit-scrollbar {
width: 5px;


}
::-webkit-scrollbar-thumb {
background-color: gray;
border-radius : 5px;
}


.ant-layout {
min-height: 100vh;
Expand Down

0 comments on commit f06b203

Please sign in to comment.