From 1c4595cd88909d333d79ccde9416bad50281b423 Mon Sep 17 00:00:00 2001 From: Mikhail Mikheev Date: Mon, 2 Sep 2019 14:59:27 +0400 Subject: [PATCH] safe page rebranding wip --- src/components/Table/index.jsx | 6 ++++-- .../components/Balances/AssetTableCell/index.jsx | 2 +- src/theme/mui.js | 13 ++++++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/components/Table/index.jsx b/src/components/Table/index.jsx index 487c2ede..d86ddd71 100644 --- a/src/components/Table/index.jsx +++ b/src/components/Table/index.jsx @@ -37,7 +37,8 @@ type State = { const styles = { root: { backgroundColor: 'white', - boxShadow: '0 -1px 4px 0 rgba(74, 85, 121, 0.5)', + borderRadius: '8px', + boxShadow: '1px 2px 10px 0 rgba(212, 212, 211, 0.59)', }, selectRoot: { lineHeight: '40px', @@ -48,8 +49,9 @@ const styles = { }, paginationRoot: { backgroundColor: 'white', - boxShadow: '0 2px 4px 0 rgba(74, 85, 121, 0.5)', + boxShadow: '1px 2px 10px 0 rgba(212, 212, 211, 0.59)', marginBottom: xl, + borderRadius: '8px', }, loader: { alignItems: 'center', diff --git a/src/routes/safe/components/Balances/AssetTableCell/index.jsx b/src/routes/safe/components/Balances/AssetTableCell/index.jsx index 905d7ad4..d9dfbffb 100644 --- a/src/routes/safe/components/Balances/AssetTableCell/index.jsx +++ b/src/routes/safe/components/Balances/AssetTableCell/index.jsx @@ -18,7 +18,7 @@ const AssetTableCell = (props: Props) => { return ( {asset.name} - {asset.name} + {asset.name} ) } diff --git a/src/theme/mui.js b/src/theme/mui.js index d44b8791..bcd6e409 100644 --- a/src/theme/mui.js +++ b/src/theme/mui.js @@ -215,7 +215,7 @@ export default createMuiTheme({ }, '@media (min-width: 960px)': { fontSize: extraSmallFontSize, // override material-ui media query - } + }, }, }, MuiTablePagination: { @@ -230,7 +230,7 @@ export default createMuiTheme({ }, caption: { fontFamily: 'Averta, monospace', - letterSpacing: '-0.5px', + fontSize: mediumFontSize, order: 3, color: disabled, }, @@ -244,9 +244,16 @@ export default createMuiTheme({ color: disabled, }, }, + MuiTableSortLabel: { + root: { + fontSize: extraSmallFontSize, + }, + }, MuiTableCell: { root: { fontFamily: 'Averta, monospace', + fontSize: mediumFontSize, + borderBottomWidth: '2px', }, head: { letterSpacing: '1px', @@ -255,7 +262,7 @@ export default createMuiTheme({ }, body: { color: primary, - letterSpacing: '-0.5px', + letterSpacing: 'normal', fontWeight: 'normal', paddingTop: xs, paddingBottom: xs,