From 9fd5289a047021c13efff4657e7f4776b9fa60fc Mon Sep 17 00:00:00 2001 From: Aeesh Date: Thu, 15 Apr 2021 13:25:55 +0100 Subject: [PATCH 1/8] cryptonomic logo --- src/assets/images/Cryptonomic_logo.svg | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/assets/images/Cryptonomic_logo.svg diff --git a/src/assets/images/Cryptonomic_logo.svg b/src/assets/images/Cryptonomic_logo.svg new file mode 100644 index 00000000..66889dfd --- /dev/null +++ b/src/assets/images/Cryptonomic_logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + From 084ba3d958b1b3ee206be3d945588635e8eedf1a Mon Sep 17 00:00:00 2001 From: Aeesh Date: Mon, 19 Apr 2021 06:39:45 +0100 Subject: [PATCH 2/8] added cryptonomic logo to home page --- src/components/Home/Banner/index.tsx | 11 +++++++++-- src/components/Home/Banner/style.tsx | 26 ++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/components/Home/Banner/index.tsx b/src/components/Home/Banner/index.tsx index 559afab2..69c89991 100644 --- a/src/components/Home/Banner/index.tsx +++ b/src/components/Home/Banner/index.tsx @@ -5,9 +5,12 @@ import { Title2, BottomDiv, Holder, - styles + styles, + LogoCon } from './style'; + import DownArrow from '../../../assets/icons/down-arrow.png'; +import CryptonomicLogo from '../../../assets/images/Cryptonomic_logo.svg'; import { withStyles } from '@material-ui/core/styles'; import Button from '@material-ui/core/Button'; @@ -17,8 +20,12 @@ const Banner = (props: any) => { ARRONAX Blockchain Analytics Tool + + Brought to you by + img + diff --git a/src/components/Home/Banner/style.tsx b/src/components/Home/Banner/style.tsx index 55c6285d..c6fac522 100644 --- a/src/components/Home/Banner/style.tsx +++ b/src/components/Home/Banner/style.tsx @@ -21,7 +21,7 @@ export const Title = styled.h1 ` `; export const Text = styled.p ` - font-family: Futura; + font-family: Roboto; font-style: normal; font-weight: 500; font-size: 38px; @@ -49,16 +49,34 @@ export const Title2 = styled.h4 ` color: #FFFFFF; `; +export const LogoCon = styled.div` + display: flex; + align-self: center; + width: 70%; + height: 48px; + margin: 10px auto 50px; + padding: 0 35px 50px; + + p { + font-size: 16px; + } + img { + width: 112px; + height: 48px; + } +`; + export const styles: any = { primaryBtn: { padding: '10px 30px', - fontSize: '16px', + fontSize: '20px', fontWeight: 'bold', - fontFamily: 'Futura', + fontFamily: 'Roboto', height: 'auto', - lineHeight: '21px', + lineHeight: '23.44px', borderRadius: '5px', letterSpacing: '2.42667px', + textTransform: 'none', boxShadow: ' none !important', outline: 'none !important', border: '1px solid #FF7477;', From 35fcdaf9dfcb1c3d45db463336ea38127773e36e Mon Sep 17 00:00:00 2001 From: Aeesh Date: Mon, 19 Apr 2021 06:41:06 +0100 Subject: [PATCH 3/8] added links --- package.json | 2 +- src/containers/Homepage/index.tsx | 59 ++++++++++++++++++------------- src/containers/Homepage/style.tsx | 14 +++++--- 3 files changed, 44 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index c43171fa..22fd1fc3 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ }, "scripts": { "start": "REACT_APP_VERSION=$(git describe --abbrev=0) REACT_APP_GIT_SHA=$(git rev-parse --short HEAD) react-scripts start", - "serve": "REACT_APP_VERSION=$(git describe --abbrev=0) REACT_APP_GIT_SHA=$(git rev-parse --short HEAD) BROWSER=none react-scripts start", + "serve": "react-scripts start", "build": "REACT_APP_VERSION=$(git describe --abbrev=0) REACT_APP_GIT_SHA=$(git rev-parse --short HEAD) react-scripts build", "test": "react-scripts test", "eject": "react-scripts eject" diff --git a/src/containers/Homepage/index.tsx b/src/containers/Homepage/index.tsx index 8f8c378f..8c783a46 100644 --- a/src/containers/Homepage/index.tsx +++ b/src/containers/Homepage/index.tsx @@ -354,17 +354,6 @@ class Home extends React.Component { img - - - - - - - - View Query - - - {/* */} @@ -374,6 +363,16 @@ class Home extends React.Component { } + + + View Graph on Periscope + + + + + + + @@ -398,17 +397,27 @@ class Home extends React.Component { } + + + View Graph on Periscope + + + + + + + img - - + + + View Baker Stats on Harpoon - View Query @@ -426,16 +435,6 @@ class Home extends React.Component { img - - - - - - - - View Query - - @@ -445,6 +444,16 @@ class Home extends React.Component { } + + + View Graph on Periscope + + + + + + + @@ -460,7 +469,7 @@ class Home extends React.Component { diff --git a/src/containers/Homepage/style.tsx b/src/containers/Homepage/style.tsx index c79d9aee..5ff36f44 100644 --- a/src/containers/Homepage/style.tsx +++ b/src/containers/Homepage/style.tsx @@ -100,17 +100,21 @@ export const MapHolder = styled.div` `; export const AnchorTag = styled.div ` - text-align:left; + text-align: left; + margin: 10px 0; a { font-family: Roboto; - font-size: 24px; - line-height: 28px; + font-size: 20px; + line-height: 23px; + letter-spacing: 0.01em; color: #2D9CDB; - margin: 0 20px; + margin: 0px 20px; text-decoration:none; } svg { - margin-right:5px; + width: 18px; + height: 16px; + margin: 0px 7px ; vertical-align: unset; } `; From 9a3a82746864f003b5f70beef647c6b3e048db18 Mon Sep 17 00:00:00 2001 From: Aeesh Date: Mon, 19 Apr 2021 08:21:51 +0100 Subject: [PATCH 4/8] UI fix --- src/components/Home/Banner/index.tsx | 2 -- src/components/Home/Banner/style.tsx | 17 +++-------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/components/Home/Banner/index.tsx b/src/components/Home/Banner/index.tsx index 69c89991..2a2bf906 100644 --- a/src/components/Home/Banner/index.tsx +++ b/src/components/Home/Banner/index.tsx @@ -2,7 +2,6 @@ import React from 'react'; import { Title, Text, - Title2, BottomDiv, Holder, styles, @@ -29,7 +28,6 @@ const Banner = (props: any) => { - Discover Arronax img diff --git a/src/components/Home/Banner/style.tsx b/src/components/Home/Banner/style.tsx index c6fac522..bcdf8746 100644 --- a/src/components/Home/Banner/style.tsx +++ b/src/components/Home/Banner/style.tsx @@ -28,7 +28,7 @@ export const Text = styled.p ` line-height: 50px; letter-spacing: 5.76333px; color: #FFFFFF; - margin: 0 0 50px; + margin: 0 0 10px; `; export const BottomDiv = styled.div ` @@ -39,23 +39,11 @@ export const BottomDiv = styled.div ` margin: 0 auto; `; -export const Title2 = styled.h4 ` - font-family: Roboto; - font-weight:300; - margin: 0 0 25px; - font-size: 25px; - line-height: 29px; - letter-spacing: 3.04333px; - color: #FFFFFF; -`; - export const LogoCon = styled.div` display: flex; align-self: center; - width: 70%; height: 48px; - margin: 10px auto 50px; - padding: 0 35px 50px; + margin: 20px auto 50px; p { font-size: 16px; @@ -68,6 +56,7 @@ export const LogoCon = styled.div` export const styles: any = { primaryBtn: { + marginTop: '50px', padding: '10px 30px', fontSize: '20px', fontWeight: 'bold', From 76aedf1dc85865a0b77fa156985a1a7c6fc9885c Mon Sep 17 00:00:00 2001 From: Aeesh Date: Mon, 19 Apr 2021 16:49:36 +0100 Subject: [PATCH 5/8] reverted change --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 22fd1fc3..c43171fa 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ }, "scripts": { "start": "REACT_APP_VERSION=$(git describe --abbrev=0) REACT_APP_GIT_SHA=$(git rev-parse --short HEAD) react-scripts start", - "serve": "react-scripts start", + "serve": "REACT_APP_VERSION=$(git describe --abbrev=0) REACT_APP_GIT_SHA=$(git rev-parse --short HEAD) BROWSER=none react-scripts start", "build": "REACT_APP_VERSION=$(git describe --abbrev=0) REACT_APP_GIT_SHA=$(git rev-parse --short HEAD) react-scripts build", "test": "react-scripts test", "eject": "react-scripts eject" From a1f2c665a88f41bee06cb26242e0e6516706961f Mon Sep 17 00:00:00 2001 From: Aeesh Date: Mon, 19 Apr 2021 16:54:27 +0100 Subject: [PATCH 6/8] modified svg tag to img --- src/components/Home/Banner/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Home/Banner/index.tsx b/src/components/Home/Banner/index.tsx index 2a2bf906..1607eccc 100644 --- a/src/components/Home/Banner/index.tsx +++ b/src/components/Home/Banner/index.tsx @@ -21,7 +21,7 @@ const Banner = (props: any) => { Blockchain Analytics Tool Brought to you by - img + Brought to you by Cryptonomic