Browse Source
Merge pull request #170 from LN-Zap/fix/modal-close
fix(modal-close): move back to the thinner modal close icons
renovate/lint-staged-8.x
JimmyMow
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
12 additions and
10 deletions
-
app/components/Contacts/ContactModal.js
-
app/components/Form/Form.js
-
app/components/ModalRoot/ModalRoot.js
-
app/components/Wallet/ReceiveModal.js
-
app/routes/activity/components/components/Modal/Modal.js
|
|
@ -2,7 +2,8 @@ import React from 'react' |
|
|
|
import PropTypes from 'prop-types' |
|
|
|
import find from 'lodash/find' |
|
|
|
import ReactModal from 'react-modal' |
|
|
|
import { FaClose, FaCircle } from 'react-icons/lib/fa' |
|
|
|
import { FaCircle } from 'react-icons/lib/fa' |
|
|
|
import { MdClose } from 'react-icons/lib/md' |
|
|
|
|
|
|
|
import { btc } from 'utils' |
|
|
|
|
|
|
@ -64,7 +65,7 @@ const ContactModal = ({ |
|
|
|
</div> |
|
|
|
<div className={styles.closeContainer}> |
|
|
|
<span onClick={closeContactModal}> |
|
|
|
<FaClose /> |
|
|
|
<MdClose /> |
|
|
|
</span> |
|
|
|
</div> |
|
|
|
</header> |
|
|
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
import React from 'react' |
|
|
|
import PropTypes from 'prop-types' |
|
|
|
|
|
|
|
import { FaClose } from 'react-icons/lib/fa' |
|
|
|
import { MdClose } from 'react-icons/lib/md' |
|
|
|
|
|
|
|
import PayForm from './PayForm' |
|
|
|
import RequestForm from './RequestForm' |
|
|
@ -21,7 +21,7 @@ const Form = ({ formType, formProps, closeForm }) => { |
|
|
|
<div className={`${styles.outtercontainer} ${formType && styles.open}`}> |
|
|
|
<div className={styles.innercontainer}> |
|
|
|
<div className={styles.esc} onClick={closeForm}> |
|
|
|
<FaClose /> |
|
|
|
<MdClose /> |
|
|
|
</div> |
|
|
|
|
|
|
|
<div className={styles.content}> |
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
import React from 'react' |
|
|
|
import PropTypes from 'prop-types' |
|
|
|
import { FaClose } from 'react-icons/lib/fa' |
|
|
|
import { MdClose } from 'react-icons/lib/md' |
|
|
|
import SuccessfulSendCoins from './SuccessfulSendCoins' |
|
|
|
import SuccessfulSendPayment from './SuccessfulSendPayment' |
|
|
|
import WalletDetails from './WalletDetails' |
|
|
@ -23,7 +23,7 @@ const ModalRoot = ({ |
|
|
|
<div className={styles.container}> |
|
|
|
<div className={styles.content}> |
|
|
|
<div className={styles.esc} onClick={hideModal}> |
|
|
|
<FaClose /> |
|
|
|
<MdClose /> |
|
|
|
</div> |
|
|
|
|
|
|
|
<SpecificModal |
|
|
|
|
|
@ -4,7 +4,8 @@ import ReactModal from 'react-modal' |
|
|
|
import copy from 'copy-to-clipboard' |
|
|
|
import QRCode from 'qrcode.react' |
|
|
|
import { showNotification } from 'notifications' |
|
|
|
import { FaCopy, FaClose } from 'react-icons/lib/fa' |
|
|
|
import { FaCopy } from 'react-icons/lib/fa' |
|
|
|
import { MdClose } from 'react-icons/lib/md' |
|
|
|
import styles from './ReceiveModal.scss' |
|
|
|
|
|
|
|
const ReceiveModal = ({ |
|
|
@ -43,7 +44,7 @@ const ReceiveModal = ({ |
|
|
|
> |
|
|
|
<div className={styles.closeContainer}> |
|
|
|
<span onClick={() => hideActivityModal()}> |
|
|
|
<FaClose /> |
|
|
|
<MdClose /> |
|
|
|
</span> |
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
import React from 'react' |
|
|
|
import PropTypes from 'prop-types' |
|
|
|
import ReactModal from 'react-modal' |
|
|
|
import { FaClose } from 'react-icons/lib/fa' |
|
|
|
import { MdClose } from 'react-icons/lib/md' |
|
|
|
|
|
|
|
import Transaction from './Transaction' |
|
|
|
import Payment from './Payment' |
|
|
@ -50,7 +50,7 @@ const Modal = ({ |
|
|
|
> |
|
|
|
<div className={styles.closeContainer}> |
|
|
|
<span onClick={() => hideActivityModal()}> |
|
|
|
<FaClose /> |
|
|
|
<MdClose /> |
|
|
|
</span> |
|
|
|
</div> |
|
|
|
<SpecificModal {...modalProps} ticker={ticker} currentTicker={currentTicker} /> |
|
|
|