diff --git a/web/cashtab/src/assets/styles/theme.js b/web/cashtab/src/assets/styles/theme.js new file mode 100644 --- /dev/null +++ b/web/cashtab/src/assets/styles/theme.js @@ -0,0 +1,3 @@ +export const theme = { + iconOutlined: '#3e3f42', +}; diff --git a/web/cashtab/src/components/App.css b/web/cashtab/src/components/App.css --- a/web/cashtab/src/components/App.css +++ b/web/cashtab/src/components/App.css @@ -33,10 +33,7 @@ #react-qrcode-logo { border-radius: 8px; } -/* Configure.js, CustomIcons.js */ -.anticon { - color: #3e3f42; -} + /* EnhancedInputs.js */ .ant-input-group-addon { background-color: #f4f4f4 !important; diff --git a/web/cashtab/src/components/App.js b/web/cashtab/src/components/App.js --- a/web/cashtab/src/components/App.js +++ b/web/cashtab/src/components/App.js @@ -1,7 +1,8 @@ import React from 'react'; import 'antd/dist/antd.less'; import '../index.css'; -import styled from 'styled-components'; +import styled, { ThemeProvider } from 'styled-components'; +import { theme } from '@assets/styles/theme'; import { FolderOpenFilled, CaretRightOutlined, @@ -172,71 +173,75 @@ location && location.pathname ? location.pathname.substr(1) : ''; return ( - - - - - - {hasTab && } - - - - - - - - - - - - - ( - + + + + + + + {hasTab && ( + )} - /> - - - - - - - - {wallet ? ( - + ) : null} + + + ); }; diff --git a/web/cashtab/src/components/Common/CustomIcons.js b/web/cashtab/src/components/Common/CustomIcons.js --- a/web/cashtab/src/components/Common/CustomIcons.js +++ b/web/cashtab/src/components/Common/CustomIcons.js @@ -1,6 +1,12 @@ import * as React from 'react'; import styled from 'styled-components'; -import { LoadingOutlined } from '@ant-design/icons'; +import { + CopyOutlined, + DollarOutlined, + LoadingOutlined, + WalletOutlined, + QrcodeOutlined, +} from '@ant-design/icons'; export const CashLoadingIcon = ( ); +export const ThemedCopyOutlined = styled(CopyOutlined)` + color: ${props => props.theme.iconOutlined} !important; +`; +export const ThemedDollarOutlined = styled(DollarOutlined)` + color: ${props => props.theme.iconOutlined} !important; +`; +export const ThemedWalletOutlined = styled(WalletOutlined)` + color: ${props => props.theme.iconOutlined} !important; +`; +export const ThemedQrcodeOutlined = styled(QrcodeOutlined)` + color: ${props => props.theme.iconOutlined} !important; +`; + export const LoadingBlock = styled.div` width: 100%; display: flex; diff --git a/web/cashtab/src/components/Common/EnhancedInputs.js b/web/cashtab/src/components/Common/EnhancedInputs.js --- a/web/cashtab/src/components/Common/EnhancedInputs.js +++ b/web/cashtab/src/components/Common/EnhancedInputs.js @@ -1,6 +1,9 @@ import * as React from 'react'; import { Form, Input, Select } from 'antd'; -import { DollarOutlined, WalletOutlined } from '@ant-design/icons'; +import { + ThemedDollarOutlined, + ThemedWalletOutlined, +} from '@components/Common/CustomIcons'; import styled from 'styled-components'; import { ScanQRCode } from './ScanQRCode'; import useBCH from '@hooks/useBCH'; @@ -91,7 +94,7 @@ } prefix={ inputProps.dollar === 1 ? ( - + ) : ( } + prefix={} autoComplete="off" addonAfter={ setVisible(!visible)} > - + )}

- Backup your wallet + Backup your wallet

- Manage Wallets + Manage Wallets

{apiError ? ( <> diff --git a/web/cashtab/src/components/Configure/__tests__/__snapshots__/Configure.test.js.snap b/web/cashtab/src/components/Configure/__tests__/__snapshots__/Configure.test.js.snap --- a/web/cashtab/src/components/Configure/__tests__/__snapshots__/Configure.test.js.snap +++ b/web/cashtab/src/components/Configure/__tests__/__snapshots__/Configure.test.js.snap @@ -39,12 +39,12 @@ className="ant-spin-container ant-spin-blur" >

,
BCHA
SLPA
,
,
0 BCHA @@ -398,16 +398,16 @@
,
BCHA
SLPA