Merge pull request #18 from echoprotocol/develop

merge develop into master

.eslintrc.json

@@ -4,6 +4,16 @@
 		"browser": true,
 		"jest": true
 	},
+	"parser": "babel-eslint",
+	"parserOptions": {
+        "ecmaVersion": 6,
+        "sourceType": "module",
+        "ecmaFeatures": {
+            "jsx": true,
+            "modules": true,
+            "experimentalObjectRestSpread": true
+        }
+    },
 	"plugins": [
 		"react",
 		"jsx-a11y",

.github/workflows/CI.yml

@@ -1,9 +1,9 @@
 name: Deploy
 
 on:
-  create:
-    tags:
-       - '*'
+  push:
+    branches:
+      - refs/tags/*
 
 jobs:
   deploy:

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "bridge-landing",
 	"description": "Echo Bridge Landing",
-	"version": "1.15.0",
+	"version": "1.16.0",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/echoprotocol/bridge-website.git"
@@ -48,13 +48,17 @@
 		"qs": "^6.5.2",
 		"randomstring": "^1.1.5",
 		"react": "^16.2.0",
+		"react-copy-to-clipboard": "^5.0.2",
 		"react-dom": "^16.2.0",
 		"react-highlight": "^0.12.0",
 		"react-hot-loader": "^4.0.0",
+		"react-media": "^1.10.0",
 		"react-perfect-scrollbar": "^1.4.4",
 		"react-redux": "^6.0.0",
 		"react-router": "^4.2.0",
+		"react-select": "^3.0.8",
 		"react-toastify": "^4.4.0",
+		"react-transition-group": "^4.3.0",
 		"redux": "^3.7.2",
 		"redux-modules": "^1.1.0",
 		"redux-modules-middleware": "^1.2.0",
@@ -65,6 +69,7 @@
 		"@babel/core": "^7.1.0",
 		"@babel/preset-env": "^7.1.0",
 		"babel-core": "^6.26.3",
+		"babel-eslint": "^10.0.3",
 		"babel-loader": "^7.1.3",
 		"babel-plugin-static-fs": "^1.1.0",
 		"babel-plugin-transform-decorators-legacy": "^1.3.4",
@@ -76,7 +81,7 @@
 		"copyfiles": "^2.1.0",
 		"cross-env": "^5.1.4",
 		"css-loader": "^3.1.0",
-		"eslint": "^4.18.2",
+		"eslint": "^4.19.1",
 		"eslint-config-airbnb": "^16.1.0",
 		"eslint-plugin-import": "^2.9.0",
 		"eslint-plugin-jsx-a11y": "^6.0.3",

src/assets/fonts/icomoon/bridge.json

@@ -0,0 +1 @@
+{"IcoMoonType":"selection","icons":[{"icon":{"paths":["M1008 235.435c-9.629-9.88-23.066-16.008-37.934-16.008-0.329 0-0.657 0.003-0.984 0.009l0.049-0.001h-237.739c-27.28 1.023-52.408 9.409-73.697 23.213l0.566-0.344v-187.435c0-0.064 0-0.139 0-0.214 0-30.162-24.451-54.613-54.613-54.613-0.090 0-0.18 0-0.27 0.001l0.014-0h-237.696c-18.31 0.479-35.534 4.625-51.128 11.728l0.824-0.336c-16.835 6.622-31.262 15.911-43.496 27.492l0.062-0.058-233.131 233.131c-22.509 24.924-36.916 57.546-38.853 93.483l-0.017 0.384v384c-0 0.076-0.001 0.166-0.001 0.256 0 30.162 24.451 54.613 54.613 54.613 0.075 0 0.15-0 0.226-0l-0.012 0h310.869v164.608c-0 0.064-0 0.139-0 0.214 0 30.162 24.451 54.613 54.613 54.613 0.090 0 0.18-0 0.27-0.001l-0.014 0h548.565c0.076 0 0.166 0.001 0.256 0.001 30.162 0 54.613-24.451 54.613-54.613 0-0.075-0-0.15-0-0.226l0 0.012v-694.869c0.008-0.346 0.013-0.753 0.013-1.161 0-14.844-6.113-28.26-15.959-37.868l-0.011-0.010zM658.133 341.163v170.667h-170.667zM292.395 121.728v170.667h-170.667zM404.395 491.477c-22.509 24.924-36.916 57.546-38.853 93.483l-0.017 0.384v146.261h-292.565v-365.696h237.696c0.076 0 0.166 0.001 0.257 0.001 30.162 0 54.613-24.451 54.613-54.613 0-0.090-0-0.18-0.001-0.271l0 0.014v-237.739h219.435v237.739zM950.528 950.912h-512v-365.739h237.739c0.063 0 0.139 0 0.214 0 30.186 0 54.656-24.47 54.656-54.656 0-0.060-0-0.12-0-0.18l0 0.009v-237.739h219.435v658.304z"],"attrs":[{"fill":"rgb(255, 255, 255)","opacity":0.502}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["copy"]},"attrs":[{"fill":"rgb(255, 255, 255)","opacity":0.502}],"properties":{"order":2,"id":0,"name":"copy","prevSize":32,"code":59648},"setIdx":0,"setId":0,"iconIdx":0}],"height":1024,"metadata":{"name":"icomoon"},"preferences":{"showGlyphs":true,"showCodes":true,"showQuickUse":true,"showQuickUse2":true,"showSVGs":true,"fontPref":{"prefix":"ic-","metadata":{"fontFamily":"icomoon","majorVersion":1,"minorVersion":0},"metrics":{"emSize":1024,"baseline":6.25,"whitespace":50},"embed":false,"showSelector":false},"imagePref":{"prefix":"icon-","png":true,"useClassSelector":true,"color":0,"bgColor":16777215},"historySize":50}}

src/assets/index.html

@@ -5,6 +5,7 @@
 	<title>Echo Bridge</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<meta name="viewport" id="viewport" content="width=device-width, initial-scale=1">
+	<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon">
 </head>
 <body>
 	<div id="root"></div>

src/assets/scss/base/_base.scss

@@ -22,6 +22,10 @@ h6 {
 	margin: 0;
 }
 
+p {
+	margin: 0;
+}
+
 input[type="text"],
 input[type="phone"],
 input[type="email"],
@@ -53,4 +57,54 @@ a {
 
 code {
 	@include source();
+	font-weight: 300;
+}
+
+.h3 {
+	font-size: 36px;
+	line-height: 40px;
+	@include futura-heavy();
+	text-transform: uppercase;
+	letter-spacing: 1.7px;
+
+	@include screen-max($xl) {
+		font-size: 28px;
+		line-height: 36px;
+		letter-spacing: 1.3px;
+	}
+
+	@include screen-max($md - 1) {
+		line-height: 40px;
+	}
+
+	@include screen-max($sm - 1) {
+		font-size: 24px;
+		line-height: 32px;
+		letter-spacing: 1.1px;
+	}
 }
+
+.h4 {
+	font-size: 24px;
+	line-height: 42px;
+	@include futura-medium();
+	letter-spacing: 1.5px;
+}
+
+.h5 {
+	font-size: 24px;
+	line-height: 42px;
+	@include futura-medium();
+	letter-spacing: 1.5px;
+
+	@include screen-max($xl) {
+		font-size: 20px;
+		line-height: 28px;
+		letter-spacing: 1.2px;
+	}
+
+	@include screen-max($sm - 1) {
+		font-size: 18px;
+		line-height: 24px;
+	}
+}

src/assets/scss/base/_fonts.scss

@@ -1,5 +1,7 @@
 $futura: "../fonts/FuturaNew";
 $source: "../fonts/SourceCodePro";
+$icomoon: "../fonts/icomoon";
+
 
 @font-face {
 	font-family: "FuturaNew";
@@ -10,13 +12,13 @@ $source: "../fonts/SourceCodePro";
 	url("#{$futura}/FuturaNewBook/FuturaNewBook.woff") format("woff"),
 	url("#{$futura}/FuturaNewBook/FuturaNewBook.otf") format("opentype"),
 	url("#{$futura}/FuturaNewBook/FuturaNewBook.ttf") format("truetype"),
-	url("#{$futura}/FuturaNewBook/FuturaNewBook.svg#FuturaNewBook")
-	format("svg");
+	url("#{$futura}/FuturaNewBook/FuturaNewBook.svg#FuturaNewBook") format("svg");
 }
 
 @mixin futura-book {
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
+
 	font: {
 		family: "FuturaNew";
 		weight: 400;
@@ -32,8 +34,7 @@ $source: "../fonts/SourceCodePro";
 	url("#{$futura}/FuturaNewMedium/FuturaNewMedium.woff") format("woff"),
 	url("#{$futura}/FuturaNewMedium/FuturaNewMedium.otf") format("opentype"),
 	url("#{$futura}/FuturaNewMedium/FuturaNewMedium.ttf") format("truetype"),
-	url("#{$futura}/FuturaNewMedium/FuturaNewMedium.svg#FuturaNewMedium")
-	format("svg");
+	url("#{$futura}/FuturaNewMedium/FuturaNewMedium.svg#FuturaNewMedium") format("svg");
 }
 
 @mixin futura-medium {
@@ -52,8 +53,7 @@ $source: "../fonts/SourceCodePro";
 	url("#{$futura}/FuturaNewDemi/FuturaNewDemi.woff") format("woff"),
 	url("#{$futura}/FuturaNewDemi/FuturaNewDemi.otf") format("opentype"),
 	url("#{$futura}/FuturaNewDemi/FuturaNewDemi.ttf") format("truetype"),
-	url("#{$futura}/FuturaNewDemi/FuturaNewDemi.svg#FuturaNewDemi")
-	format("svg");
+	url("#{$futura}/FuturaNewDemi/FuturaNewDemi.svg#FuturaNewDemi") format("svg");
 }
 
 @mixin futura-demi {
@@ -72,8 +72,7 @@ $source: "../fonts/SourceCodePro";
 	url("#{$futura}/FuturaNewBold/FuturaNewBold.woff") format("woff"),
 	url("#{$futura}/FuturaNewBold/FuturaNewBold.otf") format("opentype"),
 	url("#{$futura}/FuturaNewBold/FuturaNewBold.ttf") format("truetype"),
-	url("#{$futura}/FuturaNewBold/FuturaNewBold.svg#FuturaNewBold")
-	format("svg");
+	url("#{$futura}/FuturaNewBold/FuturaNewBold.svg#FuturaNewBold") format("svg");
 }
 
 @mixin futura-bold {
@@ -92,8 +91,7 @@ $source: "../fonts/SourceCodePro";
 	url("#{$futura}/FuturaNewHeavy/FuturaNewHeavy.woff") format("woff"),
 	url("#{$futura}/FuturaNewHeavy/FuturaNewHeavy.otf") format("opentype"),
 	url("#{$futura}/FuturaNewHeavy/FuturaNewHeavy.ttf") format("truetype"),
-	url("#{$futura}/FuturaNewHeavy/FuturaNewHeavy.svg#FuturaNewHeavy")
-	format("svg");
+	url("#{$futura}/FuturaNewHeavy/FuturaNewHeavy.svg#FuturaNewHeavy") format("svg");
 }
 
 @mixin futura-heavy {
@@ -121,3 +119,32 @@ $source: "../fonts/SourceCodePro";
 		weight: 700;
 	}
 }
+
+
+@font-face {
+	font-family: 'icomoon';
+	src: url('#{$icomoon}/icomoon.eot?1gmu71');
+	src: url('#{$icomoon}/icomoon.eot?1gmu71#iefix') format('embedded-opentype'),
+	url('#{$icomoon}/icomoon.ttf?1gmu71') format('truetype'),
+	url('#{$icomoon}/icomoon.woff?1gmu71') format('woff'),
+	url('#{$icomoon}/icomoon.svg?1gmu71#icomoon') format('svg');
+	font-weight: normal;
+	font-style: normal;
+	font-display: block;
+}
+
+[class^="ic-"],
+[class*=" ic-"] {
+	/* use !important to prevent issues with browser extensions that change fonts */
+	font-family: 'icomoon' !important;
+	speak: none;
+	font-style: normal;
+	font-weight: normal;
+	font-variant: normal;
+	text-transform: none;
+	line-height: 1;
+
+	/* Better Font Rendering =========== */
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}

src/assets/scss/base/_icons.scss

@@ -0,0 +1,3 @@
+.ic-copy:before {
+	content: "\e900";
+}