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

(Enhancement) #773 Scroll bar in tabs that are not necessary #791

Merged
merged 3 commits into from
Apr 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions src/components-v2/layouts/ListContentLayout/Layout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ export const Wrapper = styled.div`
background-color: white;
}
`
// export const Nav = styled.div`
// grid-column: 1/3;
// grid-row: 1;
// margin: 8px 0;
// padding: 16px 0;
// box-sizing: border-box;
// display: flex;
// justify-content: flex-end;
// `
export const Nav = styled.div`
grid-column: 1/3;
grid-row: 1;
margin: 0;
padding: 16px 0;
box-sizing: border-box;
display: flex;
justify-content: flex-end;
`

export const Menu = styled.div.attrs(() => ({ className: 'background' }))`
grid-column: 1;
Expand Down
4 changes: 2 additions & 2 deletions src/components/layout/Page/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
display: flex;
flex: 1 0 auto;
flex-direction: column;
padding: 135px 200px 0px 200px;
padding: 96px 200px 0px 200px;
}

@media only screen and (max-width: $(screenLg)px) {
.page {
padding: 135px $lg 0px $lg;
padding: 72px $lg 0px $lg;
}
}

Expand Down
3 changes: 1 addition & 2 deletions src/routes/safe/components/AddressBook/style.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { lg, marginButtonImg, md, sm } from '~/theme/variables'

export const styles = () => ({
formContainer: {
minHeight: '420px',
minHeight: '250px',
},
title: {
padding: lg,
Expand Down Expand Up @@ -52,7 +52,6 @@ export const styles = () => ({
cursor: 'default',
},
message: {
margin: `${sm} 0`,
padding: `${md} 0`,
maxHeight: '54px',
boxSizing: 'border-box',
Expand Down
1 change: 0 additions & 1 deletion src/routes/safe/components/Settings/style.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ export const styles = () => ({
position: 'relative',
},
message: {
margin: `${sm} 0`,
padding: `${md} 0`,
maxHeight: '54px', // to make it the same as row in Balances component
boxSizing: 'border-box',
Expand Down
2 changes: 1 addition & 1 deletion src/routes/safe/components/Transactions/TxsTable/style.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @flow
export const styles = () => ({
container: {
marginTop: '70px',
marginTop: '56px',
},
row: {
cursor: 'pointer',
Expand Down