Skip to content
This repository was archived by the owner on Nov 10, 2023. It is now read-only.

(Bugfix) - #1286 Fix Sidebar position #1340

Merged
mmv08 merged 5 commits into from
Sep 14, 2020
Merged

(Bugfix) - #1286 Fix Sidebar position #1340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
efe0f46
fix Sidebar position
alongoni Sep 10, 2020
cebe423
fix padding
alongoni Sep 10, 2020
81e8c35
fix padding and margin Help Center and Not connected Icon
alongoni Sep 11, 2020
21c9196
add scroll to Sidebar List menu
alongoni Sep 11, 2020
439f06f
Merge branch 'development' into issue-1286
nicosampler Sep 11, 2020
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
4 changes: 1 addition & 3 deletions src/components/AppLayout/Sidebar/SafeHeader/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,7 @@ const SafeHeader = ({
<Container>
<IdenticonContainer>
<FlexSpacer />
<div>
<FixedIcon type="notConnected" />
</div>
<FixedIcon type="notConnected" />
<UnStyledButton onClick={onToggleSafeList} data-testid={TOGGLE_SIDEBAR_BTN_TESTID}>
<Icon size="md" type="circleDropdown" />
</UnStyledButton>
Expand Down
6 changes: 3 additions & 3 deletions src/components/AppLayout/Sidebar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ const StyledDivider = styled(Divider)`
`

const HelpContainer = styled.div`
height: 58px;
margin-top: auto;
`

const HelpCenterLink = styled.a`
height: 30px;
width: 166px;
padding: 10px 0 0 16px;
margin: 10px 0px;
padding: 6px 0 0 16px;
margin: 14px 0px;
text-decoration: none;
display: block;

Expand Down
7 changes: 2 additions & 5 deletions src/components/AppLayout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,15 @@ const GridTopbarWrapper = styled.nav`

const GridSidebarWrapper = styled.aside`
width: 200px;
padding: 8px;
padding: 62px 8px 0 8px;
height: 100%;
background-color: ${({ theme }) => theme.colors.white};
border-right: 2px solid ${({ theme }) => theme.colors.separator};
display: flex;
flex-direction: column;
box-sizing: border-box;
position: fixed;
grid-area: sidebar;

div:last-of-type {
margin-top: auto;
}
`

const GridBodyWrapper = styled.section`
Expand Down
15 changes: 15 additions & 0 deletions src/components/List/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,21 @@ const useStyles = makeStyles((theme: Theme) =>
width: '100%',
maxWidth: 200,
backgroundColor: theme.palette.background.paper,
overflowX: 'auto',
margin: '8px 0 -4px 0',
'&::-webkit-scrollbar': {
width: '0.5em',
},
'&::-webkit-scrollbar-track': {
boxShadow: 'inset 0 0 6px rgba(0, 0, 0, 0.3)',
webkitBoxShadow: 'inset 0 0 6px rgba(0, 0, 0, 0.3)',
borderRadius: '20px',
},
'&::-webkit-scrollbar-thumb': {
backgroundColor: 'darkgrey',
outline: '1px solid #dadada',
borderRadius: '20px',
},
},
nested: {
paddingLeft: theme.spacing(3),
Expand Down