From d087227f8517af085a78e11b068519e66fdcffab Mon Sep 17 00:00:00 2001 From: brigittaforrai Date: Tue, 7 May 2019 17:06:10 +0200 Subject: [PATCH 01/30] landing redesign wip --- src/components/navigation/index.js | 15 - src/containers/app/index.js | 1 + .../exchange/components/PlaceOrderForm.js | 1 - .../funding/components/AddWithdrawForm.js | 1 - src/containers/home/NotConnectedHome/index.js | 319 +++++++----------- src/containers/loan/newLoan/NewLoanForm.js | 1 - .../lock/containers/LockForm/index.js | 1 - .../transfer/components/TokenTransferForm.js | 1 - src/styles/theme.js | 2 +- 9 files changed, 120 insertions(+), 222 deletions(-) diff --git a/src/components/navigation/index.js b/src/components/navigation/index.js index 275ae5a6..2ddab947 100644 --- a/src/components/navigation/index.js +++ b/src/components/navigation/index.js @@ -5,19 +5,13 @@ import { StyleNavLink, StyleNavItem, StyleNavList, - StyledLogoContainer, StyledNavContainer, StyledNavLeftSide, StyledNavRightSide, - StyledLogo, HamburgerMenu } from "./styles"; import { AugmintIcon } from "components/Icons"; - -import augmintLogo from "assets/images/logo/logo.png"; -import augmintLogo2x from "assets/images/logo/logo@2x.png"; -import augmintLogo3x from "assets/images/logo/logo@3x.png"; import hamburgerMenu from "assets/images/menu.svg"; import close from "assets/images/close.svg"; import { toggleScroll } from "utils/bodyHelper"; @@ -120,15 +114,6 @@ export default class SiteMenu extends React.Component { {showConnection && !isConnected &&
Not connected
} - - {!showConnection && ( - - )} - ); } diff --git a/src/containers/app/index.js b/src/containers/app/index.js index 064b7c41..03a55d47 100644 --- a/src/containers/app/index.js +++ b/src/containers/app/index.js @@ -217,6 +217,7 @@ class App extends React.Component { /> {!showConnection && ( -
+
+ + +
-
- Augmint offers digital tokens targeted to a fiat currency. -
- The first Augmint token is A-Euro, targeted to Euro. -
- Stored securely and decentralised stable crypto tokens are instantly transferable - worldwide. +
+ Modern money, beyond states. +
+
+ Borderless, secure, transparent. +

 Decentralized cryptocurrency without the volatility. +
+
+ Our first token is A-EUR.
-
- -
-
- -
- -
- - - - {keyFeatures.map(feature => ( - -
- {feature.image} -
-
- {feature.title} -
-

{feature.text}

- - ))} - - -
-
-
- Great for business -
- - - - {keyBenefits - .filter(item => item.type === "business") - .map(item => ( - -
-

{item.text}

-
- - ))} - - -
- And for individuals -
+
+
+
1
+
A-EUR
+
+ +
+
1
+
EUR
+
+
- - - {keyBenefits - .filter(item => item.type === "individual") - .map(item => ( - -
-

{item.text}

-
- - ))} - - + + Learn more about the Augmint concept + +
+
@@ -127,126 +92,78 @@ export default class NotConnectedHome extends React.Component { -
Augmint loans
-

- Use your cryptocurrencies without -
- losing them. Get a loan and spend easily. -

- - - - {howItWorks - .filter(feature => feature.type === "loan") - .map(feature => ( - -
- {feature.image} -
-
- {feature.title} -
-

{feature.text}

- - ))} - - - -
- -
-
Buy and sell A-Euro
- - - - {howItWorks - .filter(feature => feature.type === "exchange") - .map(feature => ( - -
- {feature.image} -
-
- {feature.title} -
-

{feature.text}

- - ))} - - - -
- -
-
How to use your A-Euro
- - - - {howItWorks - .filter(feature => feature.type === "use") - .map(feature => ( - -
- {feature.image} -
-
- {feature.title} -
-

{feature.text}

- - ))} - - - -
Earn more with A-Euro, get premium by locking
+
+ Actually convertible +
- {howItWorks - .filter(feature => feature.type === "lock") - .map(feature => ( - -
- {feature.image} -
-
- {feature.title} -
-

{feature.text}

- - ))} + +
+
+
A-EUR
+
+ +
+
EUR
+
+
+ +

+ Next-day conversion to and from SEPA +
+ bank accounts via exchange partners. +

+ + + + +
+
+
A-EUR
+
+ +
+
EUR
+
+
+ +

+ Buy or sell A-EUR instantly on our +
+ decentralized crypto exchange. +

+ + + - -
- -
diff --git a/src/containers/loan/newLoan/NewLoanForm.js b/src/containers/loan/newLoan/NewLoanForm.js index f3914367..2bc88a67 100644 --- a/src/containers/loan/newLoan/NewLoanForm.js +++ b/src/containers/loan/newLoan/NewLoanForm.js @@ -5,7 +5,6 @@ TODO: input formatting: decimals, thousand separators /* eslint-disable import/first */ import React from "react"; -import ReactDOM from "react-dom"; import BigNumber from "bignumber.js"; import moment from "moment"; import Button from "components/augmint-ui/button"; diff --git a/src/containers/lock/containers/LockForm/index.js b/src/containers/lock/containers/LockForm/index.js index dc4f5e86..4e5d9d2d 100644 --- a/src/containers/lock/containers/LockForm/index.js +++ b/src/containers/lock/containers/LockForm/index.js @@ -1,5 +1,4 @@ import React from "react"; -import ReactDOM from "react-dom"; import store from "modules/store"; import { connect } from "react-redux"; diff --git a/src/containers/transfer/components/TokenTransferForm.js b/src/containers/transfer/components/TokenTransferForm.js index dda7aae4..3a28f0c2 100644 --- a/src/containers/transfer/components/TokenTransferForm.js +++ b/src/containers/transfer/components/TokenTransferForm.js @@ -5,7 +5,6 @@ TODO: input formatting: decimals, thousand separators */ import React from "react"; -import ReactDOM from "react-dom"; import { connect } from "react-redux"; import { reduxForm, SubmissionError, Field } from "redux-form"; import store from "modules/store"; diff --git a/src/styles/theme.js b/src/styles/theme.js index 3ff4ad99..072a3e13 100644 --- a/src/styles/theme.js +++ b/src/styles/theme.js @@ -52,7 +52,7 @@ const theme = { h4: remCalc(24), h3: remCalc(26), h2: remCalc(34), - h1: remCalc(34) + h1: remCalc(38) } }, borderRadius: { From aa69914ecb94ffe4d305c8d020ba885fc5d048b2 Mon Sep 17 00:00:00 2001 From: brigittaforrai Date: Tue, 7 May 2019 18:03:28 +0200 Subject: [PATCH 02/30] convertible comp, styles --- src/containers/home/NotConnectedHome/index.js | 67 +++---------------- src/containers/home/convertible.js | 35 ++++++++++ 2 files changed, 45 insertions(+), 57 deletions(-) create mode 100644 src/containers/home/convertible.js diff --git a/src/containers/home/NotConnectedHome/index.js b/src/containers/home/NotConnectedHome/index.js index 89886bb2..090cbc92 100644 --- a/src/containers/home/NotConnectedHome/index.js +++ b/src/containers/home/NotConnectedHome/index.js @@ -8,6 +8,7 @@ import Button from "components/augmint-ui/button"; import Rail from "components/augmint-ui/rail"; import { InterchangeIcon } from "components/Icons"; +import Convertible from "./../convertible.js"; import { keyFeatures, howItWorks } from "./helpers.js"; @@ -28,7 +29,7 @@ export default class NotConnectedHome extends React.Component {
-
+
Modern money, beyond states.
Borderless, secure, transparent. -

 Decentralized cryptocurrency without the volatility. +
+ 
 Decentralized cryptocurrency without the volatility.
-
-
-
1
-
A-EUR
-
- -
-
1
-
EUR
-
-
+ Learn more about the Augmint concept @@ -92,9 +77,7 @@ export default class NotConnectedHome extends React.Component { -
- Actually convertible -
+
Actually convertible
@@ -103,24 +86,9 @@ export default class NotConnectedHome extends React.Component { size={{ tablet: 1, desktop: 1 / 2 }} style={{ textAlign: "left", padding: "0 50px 0 0" }} > -
-
-
A-EUR
-
- -
-
EUR
-
-
+ -

+

Next-day conversion to and from SEPA
bank accounts via exchange partners. @@ -135,24 +103,9 @@ export default class NotConnectedHome extends React.Component { size={{ tablet: 1, desktop: 1 / 2 }} style={{ textAlign: "left", padding: 0 }} > -

-
-
A-EUR
-
- -
-
EUR
-
-
+ -

+

Buy or sell A-EUR instantly on our
decentralized crypto exchange. diff --git a/src/containers/home/convertible.js b/src/containers/home/convertible.js new file mode 100644 index 00000000..2e3bcd26 --- /dev/null +++ b/src/containers/home/convertible.js @@ -0,0 +1,35 @@ +import React from "react"; +import { InterchangeIcon } from "components/Icons"; + +function Convertible(props) { + const { from, to, simple, center, left, right } = props; + + let justify = "center"; + if (center || left || right) { + justify = center || left || right; + } + + const containerStyles = { + display: "flex", + flexDirection: "row", + justifyContent: justify, + color: "white", + fontSize: 14 + }; + + return ( +

+
+ {!simple &&
1
} +
{from}
+
+ +
+ {!simple &&
1
} +
{to}
+
+
+ ); +} + +export default Convertible; From 809325073080274e8dc2667288ee698a66a89ba4 Mon Sep 17 00:00:00 2001 From: brigittaforrai Date: Mon, 13 May 2019 16:28:41 +0200 Subject: [PATCH 03/30] homepage content + styles --- src/assets/images/list-arrow.svg | 4 + src/containers/app/custom_footer_style.css | 2 + src/containers/home/NotConnectedHome/index.js | 192 +++++++++++++----- .../home/NotConnectedHome/styles.css | 82 ++++++-- src/containers/home/convertible.js | 2 +- 5 files changed, 211 insertions(+), 71 deletions(-) create mode 100644 src/assets/images/list-arrow.svg diff --git a/src/assets/images/list-arrow.svg b/src/assets/images/list-arrow.svg new file mode 100644 index 00000000..a6a2db22 --- /dev/null +++ b/src/assets/images/list-arrow.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/containers/app/custom_footer_style.css b/src/containers/app/custom_footer_style.css index e63a1ec0..3739461a 100644 --- a/src/containers/app/custom_footer_style.css +++ b/src/containers/app/custom_footer_style.css @@ -4,6 +4,8 @@ padding: 0; position: absolute; width: 100%; + margin-left: 0; + margin-right: 0; } .Site-footer .footer > div { diff --git a/src/containers/home/NotConnectedHome/index.js b/src/containers/home/NotConnectedHome/index.js index 090cbc92..2447b41a 100644 --- a/src/containers/home/NotConnectedHome/index.js +++ b/src/containers/home/NotConnectedHome/index.js @@ -10,8 +10,6 @@ import Rail from "components/augmint-ui/rail"; import { InterchangeIcon } from "components/Icons"; import Convertible from "./../convertible.js"; -import { keyFeatures, howItWorks } from "./helpers.js"; - import { theme } from "styles/media"; import "./styles.css"; import * as styles from "./styles.js"; @@ -24,23 +22,20 @@ export default class NotConnectedHome extends React.Component { return (
-
+
-
-
- Modern money, beyond states. -
+ +
- Borderless, secure, transparent. -
- 
 Decentralized cryptocurrency without the volatility. + Modern money, beyond states.
+ Borderless, secure, transparent. +
+ Decentralized cryptocurrency without the volatility.
Our first token is A-EUR.
- + - + Learn more about the Augmint concept
@@ -76,46 +74,136 @@ export default class NotConnectedHome extends React.Component { - -
Actually convertible
+ - - - - -

- Next-day conversion to and from SEPA -
- bank accounts via exchange partners. -

- - - - - - -

- Buy or sell A-EUR instantly on our -
- decentralized crypto exchange. -

- - - - +
+ + +
+ Actually convertible +
+ + + + + +

+ Next-day conversion to and from SEPA +
+ bank accounts via exchange partners. +

+ + + + + + +

+ Buy or sell A-EUR instantly on our +
+ decentralized crypto exchange. +

+ + + + + + + +
+ Have your crypto and
+ spend it too +
+

+ Borrow A-EUR against your ETH collateral. +
+ 
No waiting for approval. +

+ Learn more + + + + +
+
+
+ Crypto-backed loans +
+
    +
  • + for up to 6 months at +
    • +
  • + 4.9% per year (APR) and +
    • +
  • + 60% loan-to-value. +
    • +
+
+
+ + + + + +
+
+
+ Premium on A-EUR +
+
    +
  • + for up to 6 months at +
    • +
  • + 4.9% per year (APR). +
    • +
+
+
+ + + +
+ Earn by doing nothing +
+

+ Park your A-EUR and get a reward. +
+ 
Your bonus earning is immediately +
+ 
accounted - not just a promise.
 +
It’s still yours, locked in a smart contract. +
+ 
 Nobody can play with your money. +

+ + + +
diff --git a/src/containers/home/NotConnectedHome/styles.css b/src/containers/home/NotConnectedHome/styles.css index e7ee1727..835a79d8 100644 --- a/src/containers/home/NotConnectedHome/styles.css +++ b/src/containers/home/NotConnectedHome/styles.css @@ -7,17 +7,6 @@ article.segment { margin-top: 115px !important; } -.key-features__header { - margin-left: auto; - margin-right: auto; - max-width: 650px; -} - -h2, -.key-features__header > h2.ui.header { - font-weight: 250; -} - h1, h1.ui.header, h2, @@ -73,15 +62,9 @@ p { } } -.list-item { - padding-left: 30px; - background: url("../../../assets/images/bullet-point.svg") no-repeat left 6px; - margin: 0 40px; -} - .segment.how-to-use { position: relative; - padding-top: 200px; + padding-top: 0px; padding-bottom: 200px; background: linear-gradient( rgba(53, 0, 55, 0) 0%, @@ -180,3 +163,66 @@ a.try-now { padding: 10px 20px; width: 91px; } + +.homePage-grid { + justify-content: space-between; + margin-top: 70px; +} +.homePage-grid .homePage-column { + text-align: left; + padding: 1rem; +} +.homePage-column p { + font-size: 20px; + line-height: 120%; +} +.homePage-header { + font-weight: bold; +} +.homePage-row-header { + padding-left: 1rem; +} +.homePage-row-header, +.homepage-column-header { + margin-bottom: 10px; + margin-top: 0; + line-height: 120%; + font-size: 30px; +} + +.product-box { + background: rgba(255, 255, 255, 0.1); + padding: 40px; + height: calc(100% - 80px); + border-radius: 4px; + width: 280px; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} +.product-box h4.box-header { + margin-top: 0; + margin-bottom: 20px; + font-size: 24px; +} +.product-box ul { + padding: 0; +} + +.product-box ul .list-item { + padding-left: 25px; + background: url("../../../assets/images/list-arrow.svg") no-repeat left 8px; + list-style-type: none; + margin: 10px 0; + font-size: 20px; + color: rgba(255, 255, 255, 0.6); +} +.product-box ul .list-item span { + color: #ffad00; + font-size: 22px; + font-weight: 600; +} +.more-link { + display: block; +} diff --git a/src/containers/home/convertible.js b/src/containers/home/convertible.js index 2e3bcd26..3f3ae1e4 100644 --- a/src/containers/home/convertible.js +++ b/src/containers/home/convertible.js @@ -18,7 +18,7 @@ function Convertible(props) { }; return ( -
+
{!simple &&
1
}
{from}
From 3e40c1d991bb3876d9eaf8689ba437df9e82c40e Mon Sep 17 00:00:00 2001 From: brigittaforrai Date: Tue, 14 May 2019 15:18:47 +0200 Subject: [PATCH 04/30] mobile styles --- src/components/navigation/styles.js | 3 + src/containers/home/NotConnectedHome/index.js | 61 +++++++++++----- .../home/NotConnectedHome/styles.css | 70 ++++++++++++++++++- src/containers/home/convertible.js | 8 +-- 4 files changed, 115 insertions(+), 27 deletions(-) diff --git a/src/components/navigation/styles.js b/src/components/navigation/styles.js index b1a7760d..fb065170 100644 --- a/src/components/navigation/styles.js +++ b/src/components/navigation/styles.js @@ -68,6 +68,9 @@ export const StyledLogoContainer = styled.div` display: flex; justify-content: center; min-height: 80px; + ${breakpoint` + max-height: 180px; + `}; `; export const StyledNavLeftSide = styled.div` diff --git a/src/containers/home/NotConnectedHome/index.js b/src/containers/home/NotConnectedHome/index.js index 2447b41a..a1a9175a 100644 --- a/src/containers/home/NotConnectedHome/index.js +++ b/src/containers/home/NotConnectedHome/index.js @@ -28,13 +28,7 @@ export default class NotConnectedHome extends React.Component {
-
+
Modern money, beyond states.
- + - + Learn more about the Augmint concept
@@ -97,7 +91,7 @@ export default class NotConnectedHome extends React.Component { style={{ marginTop: 10 }} type="a" href="https://www.mrcoin.eu/en/buy/aeur" - className="ghost" + className="ghost cta" > Buy A-EUR via partner @@ -112,14 +106,17 @@ export default class NotConnectedHome extends React.Component { decentralized crypto exchange.

- - - + +
Have your crypto and
spend it too @@ -133,13 +130,17 @@ export default class NotConnectedHome extends React.Component { - +
@@ -156,13 +157,24 @@ export default class NotConnectedHome extends React.Component { 60% loan-to-value. +
- - + +
@@ -176,11 +188,22 @@ export default class NotConnectedHome extends React.Component { 4.9% per year (APR). +
- +
Earn by doing nothing
@@ -191,12 +214,12 @@ export default class NotConnectedHome extends React.Component {

accounted - not just a promise.

It’s still yours, locked in a smart contract. -
- 
 Nobody can play with your money. +

 Nobody can play with your money.

- Borrow A-EUR against your ETH collateral. -
- 
No waiting for approval. + Borrow A-EUR against your ETH collateral.
+ No waiting for approval.

Learn more @@ -103,12 +103,7 @@ export default class NotConnectedHome extends React.Component { No waiting for approval.

Learn more - @@ -137,7 +132,7 @@ export default class NotConnectedHome extends React.Component { style={{ marginTop: 26 }} type="a" className="cta" - href="https://www.mrcoin.eu/en/buy/aeur" + to="/loan/new" > Start a loan process @@ -168,7 +163,7 @@ export default class NotConnectedHome extends React.Component { style={{ marginTop: 10 }} className="cta" type="a" - href="https://www.mrcoin.eu/en/buy/aeur" + to="/lock/new" > Calculate your bonus @@ -188,19 +183,32 @@ export default class NotConnectedHome extends React.Component {
Your bonus earning is immediately
accounted - not just a promise.

It’s still yours, locked in a smart contract. -
- 
 Nobody can play with your money. +

 Nobody can play with your money.

- + + + {keyFeatures.map(feature => ( + +
+ {feature.image} +
+
+ {feature.title} +
+

{feature.text}

+ + ))} +
diff --git a/src/containers/home/NotConnectedHome/styles.css b/src/containers/home/NotConnectedHome/styles.css index 6242efd6..c0cd8b1c 100644 --- a/src/containers/home/NotConnectedHome/styles.css +++ b/src/containers/home/NotConnectedHome/styles.css @@ -134,9 +134,8 @@ p { } } -@media (min-width: 769px) and (max-width: 1455px) { - .segment.how-to-use, - .segment.team { +@media (min-width: 769px) { + .segment.how-to-use { padding-left: 190px; } .segment.advantages, From ce135babe20929659b76480b5e02b0252db11339 Mon Sep 17 00:00:00 2001 From: brigittaforrai Date: Wed, 15 May 2019 17:06:52 +0200 Subject: [PATCH 08/30] styles --- src/containers/home/NotConnectedHome/index.js | 8 ++++++-- src/containers/home/NotConnectedHome/styles.css | 10 ++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/containers/home/NotConnectedHome/index.js b/src/containers/home/NotConnectedHome/index.js index b7218907..9642d78f 100644 --- a/src/containers/home/NotConnectedHome/index.js +++ b/src/containers/home/NotConnectedHome/index.js @@ -183,7 +183,8 @@ export default class NotConnectedHome extends React.Component {
Your bonus earning is immediately
accounted - not just a promise.

It’s still yours, locked in a smart contract. -

 Nobody can play with your money. +
+ 
 Nobody can play with your money.

@@ -75,8 +75,13 @@ export default class NotConnectedHome extends React.Component { decentralized crypto exchange.

- @@ -169,8 +174,7 @@ export default class NotConnectedHome extends React.Component {
Your bonus earning is immediately
accounted - not just a promise.

It’s still yours, locked in a smart contract. -
- 
 Nobody can play with your money. +

 Nobody can play with your money.

+ +
+ + +

+ Next-day conversion to and from SEPA
+ bank accounts via exchange partners. +

+ +
- - - -

- Buy or sell A-EUR instantly on our
- decentralized crypto exchange. -

- - + +
+ + +

+ Buy or sell A-EUR instantly on our
+ decentralized crypto exchange. +

+ + +
-

- Have your crypto and
- spend it too -

-

- Borrow A-EUR against your ETH collateral.
- No waiting for approval. -

- Learn more - +
+

+ Have your crypto and
+ spend it too +

+

+ Borrow A-EUR against your ETH collateral.
+ No waiting for approval. +

+ + Learn more + + +
@@ -139,7 +161,7 @@ export default class NotConnectedHome extends React.Component {
@@ -166,19 +188,22 @@ export default class NotConnectedHome extends React.Component { -

Earn by doing nothing

-

- Park your A-EUR and get a reward. -
Your bonus earning is immediately -
accounted - not just a promise.
 -
It’s still yours, locked in a smart contract. -

 Nobody can play with your money. -

- +
+

Earn by doing nothing

+

+ Park your A-EUR and get a reward. +
Your bonus earning is immediately +
accounted - not just a promise.
 +
It’s still yours, locked in a smart contract. +
+ 
 Nobody can play with your money. +

+ +
@@ -189,7 +214,7 @@ export default class NotConnectedHome extends React.Component { {keyFeatures.map(feature => ( diff --git a/src/containers/home/NotConnectedHome/styles.css b/src/containers/home/NotConnectedHome/styles.css index 16ed045e..c10a493c 100644 --- a/src/containers/home/NotConnectedHome/styles.css +++ b/src/containers/home/NotConnectedHome/styles.css @@ -56,10 +56,8 @@ p { margin-bottom: 40px; } -@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { - p.opac { - opacity: 0.6; - } +p.opac { + opacity: 0.6; } .segment.how-to-use { @@ -118,33 +116,6 @@ p { font-weight: 400; } -@media (max-width: 768px) and (min-width: 320px) { - .team .grid .column > img, - .partner .grid .column > img { - margin-bottom: 10px; - } - - .team .grid .column h3 { - margin-top: 35px; - } - - .team .grid .column p.description, - .partner .grid .column p.description { - margin-top: 45px; - } -} - -@media (min-width: 769px) { - .segment.how-to-use { - padding-left: 190px; - } - .segment.advantages, - .segment.team, - .segment.partner { - padding: 0px 85px; - } -} - .segment.how-to-use .grid.margin { margin-bottom: 140px; } @@ -167,13 +138,16 @@ a.try-now { justify-content: space-between; margin-bottom: 120px; } -.homePage-grid.features { - margin-left: -190px; -} + .homePage-grid .homePage-column { - text-align: left; + text-align: center; padding: 1rem; } +.homePage-grid .homePage-column .grid-cont { + text-align: left; + width: 350px; + margin: 0 auto; +} .homePage-column p { font-size: 20px; line-height: 120%; @@ -192,10 +166,10 @@ a.try-now { margin-bottom: 150px; } h3.homePage-row-header { - padding-left: 1rem; + padding-left: calc((50% - 350px) / 2); } .homePage-row-header, -.homepage-column-header { +.homePage-column-header { margin-bottom: 10px; margin-top: 0; line-height: 120%; @@ -207,11 +181,13 @@ h3.homePage-row-header { padding: 40px; height: calc(100% - 80px); border-radius: 4px; - width: 250px; + width: 270px; display: flex; flex-direction: column; justify-content: center; align-items: center; + margin: 0 auto; + text-align: left; } .product-box h4.box-header { margin-top: 10px; @@ -257,8 +233,8 @@ h3.homePage-row-header { justify-content: flex-start; margin-bottom: 100px; } - .homePage-grid.features { - margin-left: 0; + .homePage-grid .homePage-column .grid-cont { + text-align: center; } .desc .cta { display: none; @@ -281,9 +257,13 @@ h3.homePage-row-header { .homePage-grid .homePage-column { text-align: center; } - .homePage-row-header { + .homePage-grid .row { + text-align: center; + } + h3.homePage-row-header { padding: 0; text-align: center; + width: 100%; } .product-box { padding: 20px; @@ -291,7 +271,7 @@ h3.homePage-row-header { height: auto; } .homePage-row-header, - .homepage-column-header { + .homePage-column-header { font-size: 28px; } @@ -314,4 +294,18 @@ h3.homePage-row-header { .segment.how-to-use { padding-bottom: 50px; } + + .team .grid .column > img, + .partner .grid .column > img { + margin-bottom: 10px; + } + + .team .grid .column h3 { + margin-top: 35px; + } + + .team .grid .column p.description, + .partner .grid .column p.description { + margin-top: 45px; + } } From 999f77fdb4ac63c31aca7ba630ffd4183be91c78 Mon Sep 17 00:00:00 2001 From: brigittaforrai Date: Mon, 20 May 2019 11:59:46 +0200 Subject: [PATCH 14/30] breaks, ghost btn style --- src/components/augmint-ui/button/styles.js | 3 ++- src/containers/home/NotConnectedHome/index.js | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/components/augmint-ui/button/styles.js b/src/components/augmint-ui/button/styles.js index 1c5419e0..ebe073e2 100644 --- a/src/components/augmint-ui/button/styles.js +++ b/src/components/augmint-ui/button/styles.js @@ -120,7 +120,8 @@ export const BaseButton = styledComponent => styledComponent` } &.orange:hover, &.orange:focus { - background-color: ${theme.colors.secondaryDark}; + border: 1px solid ${theme.colors.secondaryDark}; + background-color: transparent; color: ${theme.colors.secondaryDark}; } } diff --git a/src/containers/home/NotConnectedHome/index.js b/src/containers/home/NotConnectedHome/index.js index 711499ce..032cf10c 100644 --- a/src/containers/home/NotConnectedHome/index.js +++ b/src/containers/home/NotConnectedHome/index.js @@ -111,12 +111,12 @@ export default class NotConnectedHome extends React.Component { >

- Have your crypto and
- spend it too + Have your crypto
+ and spend it too

- Borrow A-EUR against your ETH collateral.
- No waiting for approval. + Borrow A-EUR against your
+ ETH collateral. No waiting for approval.

Learn more @@ -198,7 +198,7 @@ export default class NotConnectedHome extends React.Component {
accounted - not just a promise.

It’s still yours, locked in a smart contract.
- 
 Nobody can play with your money. + 
Nobody can play with your money.

@@ -123,9 +123,9 @@ export default class NotConnectedHome extends React.Component {

Borrow A-EUR against your ETH collateral. No waiting for approval.

- + {/*a className="more-link" href=""> Learn more - + */} From 13f767dbadd678a0c74051a043557e8d2d3d9953 Mon Sep 17 00:00:00 2001 From: brigittaforrai Date: Wed, 22 May 2019 13:02:14 +0200 Subject: [PATCH 27/30] clean up helper.js --- .../home/NotConnectedHome/helpers.js | 146 +----------------- 1 file changed, 1 insertion(+), 145 deletions(-) diff --git a/src/containers/home/NotConnectedHome/helpers.js b/src/containers/home/NotConnectedHome/helpers.js index a7f4618a..9d3d54ef 100644 --- a/src/containers/home/NotConnectedHome/helpers.js +++ b/src/containers/home/NotConnectedHome/helpers.js @@ -1,23 +1,6 @@ import React from "react"; -import { - StableIcon, - DecentralizedIcon, - SecureIcon, - DepositIcon, - SpendIcon, - GetDepositIcon, - ExchangeIcon, - PartnersIcon, - EtherDeltaIcon, - AtmIcon, - ShopIcon, - TransferIcon, - InvestIcon, - LockIcon, - WaitIcon, - PremiumIcon -} from "components/Icons"; +import { StableIcon, DecentralizedIcon, SecureIcon } from "components/Icons"; export const keyFeatures = [ { @@ -38,130 +21,3 @@ export const keyFeatures = [ "Built on blockchain technology, Augmint uses Ethereum smart contracts that offer sophisticated cryptographic security." } ]; - -export const keyBenefits = [ - { - pk: "benefit-1", - type: "business", - text: "Offer your services in a variety of digital currencies" - }, - { - pk: "benefit-2", - type: "business", - text: "Keep prices simple by using a digital currency people can relate to" - }, - { - pk: "benefit-3", - type: "business", - text: "Lower costs and reduce time by avoiding financial institutions" - }, - { - pk: "benefit-4", - type: "individual", - text: "Move money between exchanges with peace of mind" - }, - { - pk: "benefit-5", - type: "individual", - text: "Spend your cryptocurrencies without losing from future earnings" - }, - { - pk: "benefit-6", - type: "individual", - text: "Utilize the blockchain with a secure, decentralised way of spending" - } -]; - -export const howItWorks = [ - { - pk: "hiw-1", - image: , - type: "loan", - title: "Deposit ETH", - text: "Get liquid A-Euro using your ETH as collateral." - }, - { - pk: "hiw-2", - image: , - type: "loan", - title: "Spend A-Euro", - text: "Use your A-Euro or convert it to fiat. Stay in your ETH position in the meanwhile." - }, - { - pk: "hiw-3", - image: , - type: "loan", - title: "Get deposit back", - text: "Payback your loan at maturity to get back your ETH collateral." - }, - { - pk: "hiw-4", - image: , - type: "exchange", - title: "Augmint Exchange", - text: "Buy or sell A-Euro for ETH on Augmint’s exchange." - }, - { - pk: "hiw-5", - image: , - type: "exchange", - title: "Partners", - text: "Buy or sell A-Euro for fiat on one of our partner gateways." - }, - { - pk: "hiw-6", - image: , - type: "exchange", - title: "EtherDelta", - text: "Trade with A-Euro on anu ERC20 exchanges like EtherDelta." - }, - { - pk: "hiw-7", - image: , - type: "use", - title: "ATMS", - text: "Withdraw fiat cash from your A-Euro account at one of our partners’ ATMs." - }, - { - pk: "hiw-8", - image: , - type: "use", - title: "Shops", - text: "Use your A-Euro at partner merchants." - }, - { - pk: "hiw-9", - image: , - type: "use", - title: "Transfer", - text: " Send your A-Euro to any other A-Euro account." - }, - { - pk: "hiw-10", - image: , - type: "use", - title: "Use in smart contracts", - text: "A-Euro is usable in any smart contract service because it’s ERC-20 standard token." - }, - { - pk: "hiw-11", - image: , - type: "lock", - title: "Lock", - text: "Choose lock time. Your premium is immediately credited to your lock account." - }, - { - pk: "hiw-12", - image: , - type: "lock", - title: "Wait", - text: "Earn while sleeping." - }, - { - pk: "hiw-13", - image: , - type: "lock", - title: "Get premium", - text: "Your unlocked amount including your premium is available." - } -]; From 52cd5d8044d5a2b3f85df40a5aa49cff025a7ec7 Mon Sep 17 00:00:00 2001 From: brigittaforrai Date: Wed, 22 May 2019 13:15:17 +0200 Subject: [PATCH 28/30] remove video --- src/containers/home/tryIt/HowToConnect.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/containers/home/tryIt/HowToConnect.js b/src/containers/home/tryIt/HowToConnect.js index 22af5b21..dc49c540 100644 --- a/src/containers/home/tryIt/HowToConnect.js +++ b/src/containers/home/tryIt/HowToConnect.js @@ -73,7 +73,7 @@ export function HowToConnect(props) { - + To use Augmint you need an Ethereum capable browser.
@@ -85,14 +85,6 @@ export function HowToConnect(props) {
2. Connect to Main or Rinkeby test network.
- - Video about installing MetaMask and getting test A-EUR: - -