diff --git a/src/components/Send.js b/src/components/Send.js index b4ac49c..63a705b 100644 --- a/src/components/Send.js +++ b/src/components/Send.js @@ -59,6 +59,16 @@ const styles = theme => ({ left: '50%', transform: 'translate(-50%,-50%)', }, + property:{ + width: 200, + fontWeight: 'normal', + justifyContent: "center", + marginLeft: theme.spacing.unit*2, + marginRight: theme.spacing.unit, + }, + Big:{ + fontSize: '40px', + }, }); const Send = (props) =>{ const { classes } = props; @@ -73,6 +83,9 @@ const Send = (props) =>{ onSubmit={e=>{props.sendSubmit(e)}} >
+ {!(IS_TABLET)? + 総資産 {props.Propety} FNY + :null} { @@ -65,6 +66,7 @@ class AppSend extends Component { return (
{this.sendSubmit(e)}} errorMoney={this.state.errorMoney} errorNum={this.state.errorNum} diff --git a/src/containers/Request_BACKUP_63967.js b/src/containers/Request_BACKUP_63967.js index 9e56ebd..9beb4f3 100644 --- a/src/containers/Request_BACKUP_63967.js +++ b/src/containers/Request_BACKUP_63967.js @@ -1,11 +1,6 @@ import React, { Component } from 'react'; import RequestInput from '../components/RequestInput.js'; import RequestButton from '../components/RequestButton.js'; -<<<<<<< HEAD -import RequestButtonModal from '../components/RequestButtonModal.js'; - -======= ->>>>>>> 携帯版の要求画面を作成 import '../App.css' class Request extends Component {