From 840788e044f82c751cce264f642b1f9794bc4406 Mon Sep 17 00:00:00 2001 From: Liordino Neto Date: Mon, 16 Mar 2020 21:00:01 -0300 Subject: [PATCH] style: fix positioning of car page button --- .../BooleanPropertiesTable.styles.js | 4 +- .../OperatorInfo/CoinATMRadar/CoinATMRadar.js | 218 +++++++++--------- .../CoinATMRadar/CoinATMRadar.styles.js | 7 +- .../src/pages/OperatorInfo/OperatorInfo.js | 1 + 4 files changed, 115 insertions(+), 115 deletions(-) diff --git a/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.styles.js b/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.styles.js index 18a1d49d..6ce6f04e 100644 --- a/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.styles.js +++ b/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.styles.js @@ -46,9 +46,7 @@ const booleanPropertiesTableStyles = { flex: 'wrap' }, rightAligned: { - display: 'flex', - position: 'absolute', - right: 0 + marginLeft: 'auto' }, radioButtons: { display: 'flex', diff --git a/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.js b/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.js index ae064e7f..cf2d8508 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.js +++ b/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.js @@ -73,120 +73,118 @@ const CoinATMRadar = memo(() => { if (!coinAtmRadarConfig) return null return ( - <> -
-
- - - +
+
+
+

Coin ATM Radar share settings

+
+ +
-
-
-

Coin ATM Radar share settings

-
- +
+

Share information?

+
+ + save({ + active: event.target.checked + }) + } + /> +
+ {coinAtmRadarConfig.active ? 'Yes' : 'No'}
-
-
-

Share information?

-
- - save({ - active: event.target.checked - }) + -
- {coinAtmRadarConfig.active ? 'Yes' : 'No'} + ]} + save={save} + /> + {/* */}
- - {/* */} - + + + +
) }) diff --git a/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.styles.js b/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.styles.js index ab0302d2..87ebc71b 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.styles.js +++ b/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.styles.js @@ -2,10 +2,14 @@ import baseStyles from 'src/pages/Logs.styles' import { booleanPropertiesTableStyles } from 'src/components/booleanPropertiesTable/BooleanPropertiesTable.styles' const { button } = baseStyles -const { rowWrapper, rightAligned } = booleanPropertiesTableStyles +const { rowWrapper } = booleanPropertiesTableStyles const mainStyles = { button, + content: { + display: 'flex', + justifyContent: 'space-between' + }, transparentButton: { '& > *': { margin: 'auto 15px' @@ -21,7 +25,6 @@ const mainStyles = { display: 'flex', marginLeft: 120 }, - rightAligned, popoverContent: { width: 272, padding: [[10, 15]] diff --git a/new-lamassu-admin/src/pages/OperatorInfo/OperatorInfo.js b/new-lamassu-admin/src/pages/OperatorInfo/OperatorInfo.js index 23fe645b..dcdfa80c 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/OperatorInfo.js +++ b/new-lamassu-admin/src/pages/OperatorInfo/OperatorInfo.js @@ -13,6 +13,7 @@ import TermsConditions from './TermsConditions' const localStyles = { contentWrapper: { + width: '100%', marginLeft: 48, paddingTop: 15 }