diff --git a/common/assets/images/favicon.png b/common/assets/images/favicon.png index bb61b1d9..efe18386 100644 Binary files a/common/assets/images/favicon.png and b/common/assets/images/favicon.png differ diff --git a/common/assets/images/icon-check.svg b/common/assets/images/icon-check.svg deleted file mode 100755 index 3c02a8f0..00000000 --- a/common/assets/images/icon-check.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/common/assets/images/icon-edit.svg b/common/assets/images/icon-edit.svg deleted file mode 100755 index 0c863009..00000000 --- a/common/assets/images/icon-edit.svg +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/common/assets/images/icon-help-2.svg b/common/assets/images/icon-help-2.svg deleted file mode 100644 index 04d35cc9..00000000 --- a/common/assets/images/icon-help-2.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/common/assets/images/icon-help-3.svg b/common/assets/images/icon-help-3.svg index 7def12b7..dcf0b831 100644 --- a/common/assets/images/icon-help-3.svg +++ b/common/assets/images/icon-help-3.svg @@ -1 +1 @@ - + diff --git a/common/assets/images/icon-help.svg b/common/assets/images/icon-help.svg deleted file mode 100755 index c2593887..00000000 --- a/common/assets/images/icon-help.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/common/assets/images/icon-view.svg b/common/assets/images/icon-view.svg deleted file mode 100755 index 44c28e34..00000000 --- a/common/assets/images/icon-view.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/common/assets/images/icon-x.svg b/common/assets/images/icon-x.svg deleted file mode 100755 index d6a7c0f7..00000000 --- a/common/assets/images/icon-x.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/common/assets/images/logo-ethereum-2.png b/common/assets/images/logo-ethereum-2.png deleted file mode 100755 index d3c4a3ab..00000000 Binary files a/common/assets/images/logo-ethereum-2.png and /dev/null differ diff --git a/common/assets/images/logo-mycrypto.svg b/common/assets/images/logo-mycrypto.svg index 11329fc3..a20d08bb 100755 --- a/common/assets/images/logo-mycrypto.svg +++ b/common/assets/images/logo-mycrypto.svg @@ -8,7 +8,7 @@ - + diff --git a/common/assets/images/onboarding/slide-01.svg b/common/assets/images/onboarding/slide-01.svg index a9f0c75c..516b8131 100644 --- a/common/assets/images/onboarding/slide-01.svg +++ b/common/assets/images/onboarding/slide-01.svg @@ -54,7 +54,7 @@ - + @@ -69,4 +69,4 @@ - \ No newline at end of file + diff --git a/common/assets/images/onboarding/slide-06.svg b/common/assets/images/onboarding/slide-06.svg index a10c866d..d9f11521 100644 --- a/common/assets/images/onboarding/slide-06.svg +++ b/common/assets/images/onboarding/slide-06.svg @@ -32,7 +32,7 @@ - + @@ -44,4 +44,4 @@ - \ No newline at end of file + diff --git a/common/assets/images/print-sidebar.png b/common/assets/images/print-sidebar.png index 169973c0..343ac0c1 100755 Binary files a/common/assets/images/print-sidebar.png and b/common/assets/images/print-sidebar.png differ diff --git a/common/assets/images/swap.svg b/common/assets/images/swap.svg index 07c4b0f3..a188042a 100644 --- a/common/assets/images/swap.svg +++ b/common/assets/images/swap.svg @@ -13,7 +13,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -41,4 +41,4 @@ - \ No newline at end of file + diff --git a/common/components/SubTabs/SubTabs.scss b/common/components/SubTabs/SubTabs.scss index 1457ab8b..ea8c667f 100644 --- a/common/components/SubTabs/SubTabs.scss +++ b/common/components/SubTabs/SubTabs.scss @@ -16,7 +16,7 @@ transition-duration: 100ms; &.is-active { - border-bottom-color: $ether-blue; + border-bottom-color: $brand-primary; } &.is-disabled { diff --git a/common/containers/Tabs/Contracts/index.scss b/common/containers/Tabs/Contracts/index.scss deleted file mode 100644 index bde30a87..00000000 --- a/common/containers/Tabs/Contracts/index.scss +++ /dev/null @@ -1,30 +0,0 @@ -@import 'common/sass/variables'; -@import 'common/sass/mixins'; - -.Contracts { - &-header { - margin: 0; - text-align: center; - - &-tab { - @include reset-button; - color: $ether-blue; - - &:hover, - &:active { - opacity: 0.8; - } - - &.is-active { - &, - &:hover, - &:active { - color: $text-color; - cursor: default; - opacity: 1; - font-weight: 500; - } - } - } - } -} diff --git a/common/containers/Tabs/Contracts/index.tsx b/common/containers/Tabs/Contracts/index.tsx index e6fde94d..77023c8b 100644 --- a/common/containers/Tabs/Contracts/index.tsx +++ b/common/containers/Tabs/Contracts/index.tsx @@ -1,7 +1,6 @@ import translate from 'translations'; import { Interact } from './components/Interact'; import { Deploy } from './components/Deploy'; -import './index.scss'; import { reset, TReset } from 'actions/transaction'; import { resetWallet, TResetWallet } from 'actions/wallet'; import TabSection from 'containers/TabSection'; diff --git a/common/containers/Tabs/SignAndVerifyMessage/index.scss b/common/containers/Tabs/SignAndVerifyMessage/index.scss deleted file mode 100644 index c6547441..00000000 --- a/common/containers/Tabs/SignAndVerifyMessage/index.scss +++ /dev/null @@ -1,30 +0,0 @@ -@import 'common/sass/variables'; -@import 'common/sass/mixins'; - -.SignAndVerifyMsg { - &-header { - margin: 0; - text-align: center; - - &-tab { - @include reset-button; - color: $ether-blue; - - &:hover, - &:active { - opacity: 0.8; - } - - &.is-active { - &, - &:hover, - &:active { - color: $text-color; - cursor: default; - opacity: 1; - font-weight: 500; - } - } - } - } -} diff --git a/common/containers/Tabs/SignAndVerifyMessage/index.tsx b/common/containers/Tabs/SignAndVerifyMessage/index.tsx index 0d387a46..1a35b697 100644 --- a/common/containers/Tabs/SignAndVerifyMessage/index.tsx +++ b/common/containers/Tabs/SignAndVerifyMessage/index.tsx @@ -3,7 +3,6 @@ import translate from 'translations'; import SignMessage from './components/SignMessage'; import VerifyMessage from './components/VerifyMessage'; import TabSection from 'containers/TabSection'; -import './index.scss'; import { RouteComponentProps, Switch, Route, Redirect } from 'react-router'; import SubTabs from 'components/SubTabs'; import { RouteNotFound } from 'components/RouteNotFound'; diff --git a/common/containers/Tabs/Swap/components/CurrentRates.scss b/common/containers/Tabs/Swap/components/CurrentRates.scss index ec48f738..21d2cf97 100644 --- a/common/containers/Tabs/Swap/components/CurrentRates.scss +++ b/common/containers/Tabs/Swap/components/CurrentRates.scss @@ -10,7 +10,7 @@ &-panel { position: relative; margin: 0 auto 0; - background: linear-gradient(150deg, $ether-blue, $ether-navy); + background: linear-gradient(150deg, $brand-primary, $ether-navy); @include mono; &-side { diff --git a/common/reducers/config/networks/staticNetworks.ts b/common/reducers/config/networks/staticNetworks.ts index c29cad75..7843c327 100644 --- a/common/reducers/config/networks/staticNetworks.ts +++ b/common/reducers/config/networks/staticNetworks.ts @@ -45,7 +45,7 @@ export const INITIAL_STATE: State = { unit: 'ETH', chainId: 1, isCustom: false, - color: '#0e97c0', + color: '#007896', blockExplorer: makeExplorer('Etherscan', 'https://etherscan.io'), tokenExplorer: { name: ethPlorer, diff --git a/common/sass/variables/colors.scss b/common/sass/variables/colors.scss index 64d2ad2d..6e3a0425 100644 --- a/common/sass/variables/colors.scss +++ b/common/sass/variables/colors.scss @@ -9,7 +9,7 @@ $gray-light: #9a9a9a; $gray-lighter: #ececec; $gray-lightest: #fafafa; -$brand-primary: $ether-blue; +$brand-primary: #007896; $brand-success: #5dba5a; $brand-info: $ether-navy; $brand-warning: #ff9800; diff --git a/common/sass/variables/forms.scss b/common/sass/variables/forms.scss index 92ba05df..7b0be5b6 100644 --- a/common/sass/variables/forms.scss +++ b/common/sass/variables/forms.scss @@ -27,7 +27,7 @@ $dropdown-border: rgba(0, 0, 0, 0.15); $dropdown-fallback-border: $gray-lighter; $dropdown-divider-bg: #e5e5e5; $dropdown-link-color: $ether-navy; -$dropdown-link-hover-color: $ether-blue; +$dropdown-link-hover-color: $brand-primary; $dropdown-link-hover-bg: $gray-lightest; $dropdown-link-active-color: $component-active-color; $dropdown-link-active-bg: $component-active-bg;