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 @@ -38,24 +38,3 @@ margin-right: 0; } } - -/* OK and Cancel button colors on Modals*/ -.ant-card-actions > li > span:hover, -.ant-btn:hover, -.ant-btn:focus { - color: #f59332; - transition: color 0.3s; - background-color: white; -} -.ant-btn { - border-radius: 8px; - background-color: #fff; - color: rgb(62, 63, 66); - font-weight: bold; -} - -/*Hover on currency dropdowns */ -.selectedCurrencyOption:hover { - color: #fff !important; - background-color: #ff8d00 !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,7 @@ import React from 'react'; import 'antd/dist/antd.less'; import '../index.css'; -import styled, { ThemeProvider } from 'styled-components'; +import styled, { ThemeProvider, createGlobalStyle } from 'styled-components'; import { theme } from '@assets/styles/theme'; import { FolderOpenFilled, @@ -30,6 +30,26 @@ import fbt from 'fbt'; +const GlobalStyle = createGlobalStyle` + .ant-modal-wrap > div > div.ant-modal-content > div > div > div.ant-modal-confirm-btns > button, .ant-modal > button, .ant-modal-confirm-btns > button, .ant-modal-footer > button { + border-radius: 8px; + background-color: #fff; + color: rgb(62, 63, 66); + font-weight: bold; + } + + .ant-modal-wrap > div > div.ant-modal-content > div > div > div.ant-modal-confirm-btns > button:hover,.ant-modal-confirm-btns > button:hover, .ant-modal-footer > button:hover { + color: #f59332; + transition: color 0.3s; + background-color: white; + } + + .selectedCurrencyOption:hover { + color: #fff !important; + background-color: #ff8d00 !important; + } +`; + const CustomApp = styled.div` text-align: center; font-family: 'Gilroy', sans-serif; @@ -174,6 +194,7 @@ return ( + 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 @@ -4,7 +4,7 @@ ThemedDollarOutlined, ThemedWalletOutlined, } from '@components/Common/CustomIcons'; -import styled, { css } from 'styled-components/macro'; +import styled, { css } from 'styled-components'; import { ScanQRCode } from './ScanQRCode'; import useBCH from '@hooks/useBCH'; import { currency } from '@components/Common/Ticker.js'; 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,7 +39,7 @@ className="ant-spin-container ant-spin-blur" >