diff --git a/src/app.css b/src/app.css index 163b8dc1..1eeb657e 100644 --- a/src/app.css +++ b/src/app.css @@ -1,6 +1,46 @@ +button { + background-color: #4b73c8; + color: #fff; + border-radius: 4px; + border: 0px solid transparent; + padding: 40px; + font-size: 1.25em; + cursor: pointer; +} +button:hover { + background-color: #2e68e5; +} +button:focus { + background-color: #345bac; +} body { margin: 0; } +a { + color: unset; + text-decoration: unset; +} .app { color: #333; + font-family: sans-serif; + font-size: 1.5em; +} +.app .nav { + display: flex; + direction: flex-row; + justify-content: space-between; + align-items: center; + height: 100px; +} +.app .title, +.app .balance { + padding: 20px; +} +.app .congratulations, +.app .home, +.app .pay, +.app .prove, +.app .start { + margin-top: 50px; + text-align: center; } diff --git a/src/components/App.js b/src/components/App.js index d9eaa7b2..e8c48a26 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -1,5 +1,6 @@ import React, { Component } from 'react'; import { withBalance } from '../wrappers/web3' +import { Link } from 'react-router-dom' class App extends Component { render() { @@ -8,7 +9,10 @@ class App extends Component { return (
-
Balance (in Wei): {balance}
+
+ tBTC +
+
Balance (in Wei): {balance}
{ children }
diff --git a/src/components/Congratulations.js b/src/components/Congratulations.js index e0120792..46d9ec5e 100644 --- a/src/components/Congratulations.js +++ b/src/components/Congratulations.js @@ -1,7 +1,9 @@ import React from 'react'; const Congratulations = () => ( - +
+ +
) export default Congratulations diff --git a/src/components/Home.js b/src/components/Home.js index 20ce6ffd..eca859c8 100644 --- a/src/components/Home.js +++ b/src/components/Home.js @@ -1,7 +1,9 @@ import React from 'react'; const Home = ({ history }) => ( - +
+ +
) export default Home diff --git a/src/components/Pay.js b/src/components/Pay.js index 3ffcdcc4..74ae3b64 100644 --- a/src/components/Pay.js +++ b/src/components/Pay.js @@ -1,15 +1,19 @@ import React from 'react'; const Pay = ({ confirming, history }) => { + let button; + if (confirming) { - return ( - - ) + button = } else { - return ( - - ) + button = } + + return ( +
+ {button} +
+ ) } export default Pay diff --git a/src/components/Prove.js b/src/components/Prove.js index dbe046a9..ccfd2924 100644 --- a/src/components/Prove.js +++ b/src/components/Prove.js @@ -1,7 +1,9 @@ import React from 'react'; const Prove = ({ history }) => ( - +
+ +
) export default Prove diff --git a/src/components/Start.js b/src/components/Start.js index 4436a36b..f512c893 100644 --- a/src/components/Start.js +++ b/src/components/Start.js @@ -1,7 +1,9 @@ import React from 'react'; const Start = ({ history }) => ( - +
+ +
) export default Start diff --git a/src/css/app.less b/src/css/app.less index 54900621..5bf93c15 100644 --- a/src/css/app.less +++ b/src/css/app.less @@ -1,9 +1,35 @@ @import 'colors.less'; +@import 'button.less'; + body { margin: 0; } +a { + color: unset; + text-decoration: unset; +} + .app { color: @black; + font-family: sans-serif; + font-size: 1.5em; + + .nav { + display: flex; + direction: flex-row; + justify-content: space-between; + align-items: center; + height: 100px; + } + + .title, .balance { + padding: 20px; + } + + .congratulations, .home, .pay, .prove, .start { + margin-top: 50px; + text-align: center; + } } \ No newline at end of file diff --git a/src/css/button.less b/src/css/button.less new file mode 100644 index 00000000..fcc7cd63 --- /dev/null +++ b/src/css/button.less @@ -0,0 +1,17 @@ +button { + background-color: @blue; + color: @white; + border-radius: 4px; + border: 0px solid transparent; + padding: 40px; + font-size: 1.25em; + cursor: pointer; + + &:hover { + background-color: saturate(@blue, 25%); + } + + &:focus { + background-color: darken(@blue, 10%); + } +} \ No newline at end of file diff --git a/src/css/colors.less b/src/css/colors.less index 45605ae6..eb99f76f 100644 --- a/src/css/colors.less +++ b/src/css/colors.less @@ -1,2 +1,3 @@ @white: #fff; -@black: #333; \ No newline at end of file +@black: #333; +@blue: rgb(75, 115, 200);