diff --git a/common/assets/fonts/social-media.woff b/common/assets/fonts/social-media.woff index d4d0e518..7a4155b9 100644 Binary files a/common/assets/fonts/social-media.woff and b/common/assets/fonts/social-media.woff differ diff --git a/common/assets/fonts/social-media.woff2 b/common/assets/fonts/social-media.woff2 index f2acafc8..78e4b3ef 100644 Binary files a/common/assets/fonts/social-media.woff2 and b/common/assets/fonts/social-media.woff2 differ diff --git a/common/components/AlphaAgreement/index.tsx b/common/components/AlphaAgreement/index.tsx deleted file mode 100644 index 7ec4b42a..00000000 --- a/common/components/AlphaAgreement/index.tsx +++ /dev/null @@ -1,66 +0,0 @@ -import React from 'react'; -import './index.scss'; - -const LS_KEY = 'acknowledged-alpha'; - -interface State { - isFading: boolean; - hasAcknowledged: boolean; -} -export default class AlphaAgreement extends React.PureComponent<{}, State> { - public state = { - hasAcknowledged: !!localStorage.getItem(LS_KEY), - isFading: false - }; - - public render() { - if (this.state.hasAcknowledged) { - return null; - } - - const isFading = this.state.isFading ? 'is-fading' : ''; - - return ( -
- You are about to access a beta version of MyCrypto that is currently in development. In - its current state, it should only be used for testing, not for important transactions. -
-- Any wallets you generate should not hold a significant value, and any transactions you - make should be for small amounts. MyCrypto does not claim responsibility for any issues - that happen while using the beta version. -
-Are you sure you would like to continue?
- -+ You are about to use a version of MyCrypto that hasn't been released yet. While we are + confident that it is close to being production ready, you may want to use the current + production site for larger or more time-sensitive transactions. +
+
+ Feedback and bug reports are greatly appreciated. You can file issues on our{' '}
+
Are you sure you would like to continue?
+ +{error.message}
{error.message}
);
diff --git a/common/components/Footer/index.scss b/common/components/Footer/index.scss
index cf7ac9d5..23a39852 100644
--- a/common/components/Footer/index.scss
+++ b/common/components/Footer/index.scss
@@ -158,10 +158,10 @@ $footer-link-color: #fff;
.SocialMediaLink {
transition: opacity 0.3s;
color: #fff;
- margin: 0.65rem;
+ margin: 0.55rem;
> i {
- font-size: 1.2rem;
+ font-size: 1.15rem;
}
&:hover,
diff --git a/common/components/Footer/index.tsx b/common/components/Footer/index.tsx
index 46e2e9f1..15bf7e38 100644
--- a/common/components/Footer/index.tsx
+++ b/common/components/Footer/index.tsx
@@ -5,7 +5,8 @@ import {
ethercardReferralURL,
donationAddressMap,
VERSION,
- knowledgeBaseURL
+ knowledgeBaseURL,
+ discordURL
} from 'config';
import React from 'react';
import PreFooter from './PreFooter';
@@ -46,6 +47,10 @@ const SOCIAL_MEDIA: Link[] = [
{
link: 'https://www.reddit.com/r/mycrypto/',
text: 'reddit'
+ },
+ {
+ link: discordURL,
+ text: 'discord'
}
];
diff --git a/common/components/Header/index.scss b/common/components/Header/index.scss
index 24af876a..8b93a087 100644
--- a/common/components/Header/index.scss
+++ b/common/components/Header/index.scss
@@ -41,6 +41,7 @@ $small-size: 900px;
font-weight: 300;
color: #fff;
transition: background-color 80ms ease;
+ background: $gray-darker;
a {
color: #fff;
@@ -54,7 +55,6 @@ $small-size: 900px;
}
// Colors
- &,
&.is-primary {
background: $brand-primary;
}
diff --git a/common/components/Header/index.tsx b/common/components/Header/index.tsx
index d0884ce3..a0ab67b2 100644
--- a/common/components/Header/index.tsx
+++ b/common/components/Header/index.tsx
@@ -155,13 +155,6 @@ class Header extends Component