From 44dfa74baafadaaefab19b69c81b75958bda29f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Mart=C3=ADnez?= Date: Mon, 27 May 2019 12:22:15 +0200 Subject: [PATCH] Fix styles in owners table --- .../Settings/ManageOwners/dataFetcher.js | 3 ++ .../Settings/ManageOwners/index.jsx | 4 +- .../components/Settings/ManageOwners/style.js | 46 +++++-------------- 3 files changed, 17 insertions(+), 36 deletions(-) diff --git a/src/routes/safe/components/Settings/ManageOwners/dataFetcher.js b/src/routes/safe/components/Settings/ManageOwners/dataFetcher.js index 520b43ea..5d5d2111 100644 --- a/src/routes/safe/components/Settings/ManageOwners/dataFetcher.js +++ b/src/routes/safe/components/Settings/ManageOwners/dataFetcher.js @@ -31,6 +31,7 @@ export const generateColumns = () => { disablePadding: false, label: 'Name', width: 150, + custom: false, align: 'left', } @@ -40,6 +41,7 @@ export const generateColumns = () => { disablePadding: false, label: 'Address', width: 350, + custom: false, align: 'left', } @@ -48,6 +50,7 @@ export const generateColumns = () => { order: false, disablePadding: false, label: '', + align: 'right', custom: true, } diff --git a/src/routes/safe/components/Settings/ManageOwners/index.jsx b/src/routes/safe/components/Settings/ManageOwners/index.jsx index cfb1d919..cbf8ca68 100644 --- a/src/routes/safe/components/Settings/ManageOwners/index.jsx +++ b/src/routes/safe/components/Settings/ManageOwners/index.jsx @@ -22,7 +22,9 @@ import Button from '~/components/layout/Button' import AddOwnerModal from './AddOwnerModal' import OwnerAddressTableCell from './OwnerAddressTableCell' import type { Owner } from '~/routes/safe/store/models/owner' -import { getOwnerData, generateColumns, OWNERS_TABLE_ADDRESS_ID, type OwnerRow, } from './dataFetcher' +import { + getOwnerData, generateColumns, OWNERS_TABLE_ADDRESS_ID, type OwnerRow, +} from './dataFetcher' import { sm, boldFont } from '~/theme/variables' import { styles } from './style' diff --git a/src/routes/safe/components/Settings/ManageOwners/style.js b/src/routes/safe/components/Settings/ManageOwners/style.js index 6d69124f..9b02b06e 100644 --- a/src/routes/safe/components/Settings/ManageOwners/style.js +++ b/src/routes/safe/components/Settings/ManageOwners/style.js @@ -11,43 +11,19 @@ export const styles = () => ({ formContainer: { minHeight: '369px', }, - owners: { - padding: lg, - }, - name: { - textOverflow: 'ellipsis', - overflow: 'hidden', - }, - userName: { - whiteSpace: 'nowrap', - }, - owner: { - padding: md, - paddingLeft: lg, - alignItems: 'center', - }, - user: { - justifyContent: 'left', - }, - open: { - paddingLeft: sm, - width: 'auto', + hide: { '&:hover': { - cursor: 'pointer', + backgroundColor: '#fff3e2', + }, + '&:hover $actions': { + visibility: 'initial', + }, + '&:focus $actions': { + visibility: 'initial', }, }, - container: { - marginTop: xs, - alignItems: 'center', - }, - address: { - paddingLeft: '6px', - }, - open: { - paddingLeft: sm, - width: 'auto', - '&:hover': { - cursor: 'pointer', - }, + actions: { + justifyContent: 'flex-end', + visibility: 'hidden', }, })