diff --git a/web/cashtab/src/components/App.css b/web/cashtab/src/components/App.css index be8a0f58e..f1069ca7a 100644 --- a/web/cashtab/src/components/App.css +++ b/web/cashtab/src/components/App.css @@ -1,340 +1,335 @@ @import '~antd/dist/antd.less'; @import '~@fortawesome/fontawesome-free/css/all.css'; @import url('https://fonts.googleapis.com/css?family=Khula&display=swap&.css'); @font-face { font-family: 'Roboto Mono'; src: local('Roboto Mono'), url(../assets/fonts/RobotoMono-Regular.ttf) format('truetype'); font-weight: normal; } /* Hide up and down arros on input type="number" */ /* Chrome, Safari, Edge, Opera */ input::-webkit-outer-spin-button, input::-webkit-inner-spin-button { -webkit-appearance: none; margin: 0; } /* Hide up and down arros on input type="number" */ /* Firefox */ input[type='number'] { -moz-appearance: textfield; } html, body { max-width: 100%; overflow-x: hidden; } .ant-modal-wrap.ant-modal-centered::-webkit-scrollbar { display: none; } .ant-list-item-meta .ant-list-item-meta-content { display: flex; } #react-qrcode-logo { border-radius: 8px; } .ant-card-actions > li > span:hover, .ant-btn:hover, .ant-btn:focus { color: #f59332; transition: color 0.3s; background-color: white; } .ant-card-actions > li { color: #3e3f42; } .anticon { color: #3e3f42; } .ant-list-item-meta-description, .ant-list-item-meta-title { color: #3e3f42; } .ant-list-item-meta-description > :first-child { right: 20px !important; position: absolute; } .ant-modal-body .ant-list-item-meta { height: 85px; width: 85px; padding-left: 10px; padding-top: 10px; padding-bottom: 20px; overflow: visible !important; } .identicon { border-radius: 50%; width: 200px; height: 200px; margin-top: -75px; margin-left: -75px; margin-bottom: 20px; box-shadow: 1px 1px 2px 1px #444; } .ant-list-item-meta { width: 40px; height: 40px; } .ant-checkbox-inner { border: 1px solid #eaedf3 !important; background: white; } .ant-checkbox-inner::after { border-color: white !important; } .ant-card-bordered { border: 1px solid rgb(234, 237, 243); border-radius: 8px; } .ant-card-actions { border-top: 1px solid rgb(234, 237, 243); border-bottom: 1px solid rgb(234, 237, 243); border-bottom-left-radius: 8px; border-bottom-right-radius: 8px; box-shadow: 0px 5px 8px rgba(0, 0, 0, 0.35); } .ant-input-group-addon { background-color: #f4f4f4 !important; border: 1px solid rgb(234, 237, 243); color: #3e3f42 !important; } .ant-menu-item.ant-menu-item-selected > * { color: #fff !important; } .ant-menu-item.ant-menu-item-selected { border: 0; overflow: hidden; text-align: left; padding-left: 28px; background-color: rgba(255, 255, 255, 0.2) !important; } .ant-btn { border-radius: 8px; background-color: #fff; color: rgb(62, 63, 66); font-weight: bold; } .ant-card-actions > li:not(:last-child) { border-right: 0; } .ant-list-item-meta-avatar > img { margin-left: -12px; transform: translate(0, -6px); } .ant-list-item-meta-avatar > svg { margin-right: -70px; } .ant-layout-sider-dark { background: linear-gradient(0deg, #040c3c, #212c6e); } .ant-menu-dark { background: none; } .ant-layout-sider-zero-width-trigger.ant-layout-sider-zero-width-trigger-left .anticon.anticon-bars { color: #fff; transform: scale(1.3); } .ant-layout-sider-zero-width-trigger.ant-layout-sider-zero-width-trigger-left { background: #3e3f42; border-radius: 0 8px 8px 0; } .ant-btn-group .ant-btn-primary:first-child:not(:last-child) { border-right-color: transparent !important; } .ant-btn-group .ant-btn-primary:last-child:not(:first-child), .ant-btn-group .ant-btn-primary + .ant-btn-primary { border-left-color: #20242d !important; } .ant-popover-inner-content { color: white; } .ant-modal-body .ant-card { max-width: 100%; } .ant-upload.ant-upload-drag { border: 1px solid #eaedf3; border-radius: 8px; background: #d3d3d3; } .ant-upload-list-item:hover .ant-upload-list-item-info { background-color: #ffffff; } .ant-radio-group { width: 100%; margin-top: 10px; } .ant-radio-button-wrapper { background: rgba(255, 255, 255, 0.2); width: 104px; border: none; text-align: center; color: #fff; } .ant-radio-button-wrapper:hover { color: #fff; background: rgba(255, 255, 255, 0.3); } .ant-radio-group-small .ant-radio-button-wrapper { height: 35px; line-height: 35px; } .ant-radio-button-wrapper-checked { background: #ff8d00 !important; border: none !important; } .ant-radio-button-wrapper:first-child { border-radius: 100px 0 0 100px; } .ant-radio-button-wrapper:last-child { border-radius: 0 100px 100px 0; } ::selection { background-color: #ff8d00; } @media (max-width: 768px) { .ant-notification { width: 100%; top: 20px !important; max-width: unset; margin-right: 0; } } @media (max-width: 350px) { .ant-select-selection-selected-value { font-size: 10px; } } -/*Custom color for CashSpin*/ -.ant-spin > span > svg { - fill: #ff8d00; -} - /*Custom Input Fields */ input.ant-input, .ant-select-selection { background-color: #fff !important; box-shadow: none !important; border-radius: 4px; font-weight: bold; color: rgb(62, 63, 66); opacity: 1; height: 50px; } .ant-select-selection:hover { border: 1px solid #eaedf3; } .ant-select-selection-selected-value { color: rgb(62, 63, 66); } .ant-select-dropdown-menu-item { color: #444; background-color: #fff; } .ant-select-dropdown-menu-item-active, .ant-select-dropdown-menu-item:hover { color: #fff; background-color: #ff8d00 !important; } .selectedCurrencyOption:hover { color: #fff !important; background-color: #ff8d00 !important; } .ant-input-affix-wrapper { background-color: #fff; border: 1px solid #eaedf3 !important; } input.ant-input, .ant-select-selection { border: none; } .ant-input::placeholder { text-align: left; } .ant-select-selector { height: 60px !important; border: 1px solid #eaedf3 !important; } /*Revs with updated Antd*/ .ant-select-single .ant-select-selector .ant-select-selection-item, .ant-select-single .ant-select-selector .ant-select-selection-placeholder { line-height: 60px; text-align: left; color: #3e3f42; font-weight: bold; } /* Handle new antd error formatting */ .ant-form-item-has-error > div > div.ant-form-item-control-input > div > span > span > span.ant-input-affix-wrapper { background-color: #fff; border-color: #f04134 !important; } .ant-form-item-has-error .ant-input, .ant-form-item-has-error .ant-input-affix-wrapper, .ant-form-item-has-error .ant-input:hover, .ant-form-item-has-error .ant-input-affix-wrapper:hover { background-color: #fff; border-color: #f04134 !important; } .ant-form-item-has-error .ant-select:not(.ant-select-disabled):not(.ant-select-customize-input) .ant-select-selector { background-color: #fff; border-color: #f04134 !important; } diff --git a/web/cashtab/src/components/Common/CustomIcons.js b/web/cashtab/src/components/Common/CustomIcons.js index c77b846b4..2b123ba9f 100644 --- a/web/cashtab/src/components/Common/CustomIcons.js +++ b/web/cashtab/src/components/Common/CustomIcons.js @@ -1,31 +1,32 @@ import * as React from 'react'; import styled from 'styled-components'; import { LoadingOutlined } from '@ant-design/icons'; export const CashLoadingIcon = ( ); export const LoadingBlock = styled.div` width: 100%; display: flex; align-items: center; justify-content: center; padding: 24px; flex-direction: column; svg { width: 50px; height: 50px; fill: #ff8d00; } `; export const CashLoader = () => ( ); 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 index 1268a3c64..fad5b353e 100644 --- a/web/cashtab/src/components/Configure/__tests__/__snapshots__/Configure.test.js.snap +++ b/web/cashtab/src/components/Configure/__tests__/__snapshots__/Configure.test.js.snap @@ -1,447 +1,449 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Configure with a wallet 1`] = `

Backup your wallet

Your seed phrase is the only way to restore your wallet. Write it down. Keep it safe.
Click to reveal seed phrase

Manage Wallets

`; exports[`Configure without a wallet 1`] = `

Backup your wallet

Your seed phrase is the only way to restore your wallet. Write it down. Keep it safe.

Manage Wallets

`;