๐ On the Web
diff --git a/common/components/Footer/index.scss b/common/components/Footer/index.scss
new file mode 100644
index 00000000..ef7f1120
--- /dev/null
+++ b/common/components/Footer/index.scss
@@ -0,0 +1,62 @@
+@import "common/sass/variables";
+
+// footer
+.Footer {
+ background-color: $ether-navy;
+ color: white;
+ margin-top: 100px;
+ padding-top: $space-xs;
+ padding-bottom: $space-sm;
+
+ &-logo {
+ width: 100%;
+ height: auto;
+ max-width: 20rem;
+ }
+
+ &-info,
+ &-links {
+ padding-left: 3rem;
+ }
+
+ p {
+ margin: $space-xs 0 $space-sm;
+ }
+
+ a {
+ color: #4ac8ed;
+ &:hover,
+ &:focus {
+ color: darken(#4ac8ed, 5%);
+ }
+ }
+
+ h5 {
+ font-size: $font-size-bump;
+ margin: $font-size-small 0 0;
+
+ i {
+ margin-left: -1.5em;
+ margin-right: .25em;
+ }
+ }
+
+ ul {
+ list-style: none;
+ padding-left: $space-sm;
+ margin: 0 0 $space-xs 0;
+ }
+
+ li,
+ p {
+ font-size: $font-size-small;
+ margin: $space-sm 0;
+ }
+
+ @media screen and (max-width: $grid-float-breakpoint) {
+ .row {
+ margin-left: -.5rem;
+ margin-right: -.5rem;
+ }
+ }
+}
diff --git a/common/components/Header/components/Navigation.jsx b/common/components/Header/components/Navigation.jsx
new file mode 100644
index 00000000..69f9fcc1
--- /dev/null
+++ b/common/components/Header/components/Navigation.jsx
@@ -0,0 +1,110 @@
+import React, { Component } from 'react';
+import { Link } from 'react-router';
+import translate from 'translations';
+import PropTypes from 'prop-types';
+
+import './Navigation.scss';
+
+const tabs = [
+ {
+ name: 'NAV_GenerateWallet',
+ link: '/'
+ },
+ {
+ name: 'NAV_SendEther',
+ link: 'send-transaction'
+ },
+ {
+ name: 'NAV_Swap',
+ link: 'swap'
+ },
+ {
+ name: 'NAV_Offline'
+ },
+ {
+ name: 'NAV_Contracts'
+ },
+ {
+ name: 'NAV_ViewWallet',
+ link: 'view-wallet'
+ },
+ {
+ name: 'NAV_Help',
+ link: 'help'
+ }
+];
+
+export default class TabsOptions extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ showLeftArrow: false,
+ showRightArrow: false
+ };
+ }
+
+ static propTypes = {
+ location: PropTypes.object
+ };
+
+ tabClick() {}
+
+ scrollLeft() {}
+
+ scrollRight() {}
+
+ render() {
+ const { location } = this.props;
+ return (
+
+ {this.state.showLeftArrow &&
+ this.scrollLeft(100)}
+ >
+ «
+ }
+
+
+ {tabs.map((object, i) => {
+ // if the window pathname is the same or similar to the tab objects name, set the active toggle
+ const activeOrNot =
+ location.pathname === object.link ||
+ location.pathname.substring(1) === object.link
+ ? 'is-active'
+ : '';
+ return (
+
+
+ );
+ })}
+
+
this.scrollRight(100)}
+ >
+ »
+ }
+
+ );
+ }
+}
diff --git a/common/components/Header/components/Navigation.scss b/common/components/Header/components/Navigation.scss
new file mode 100644
index 00000000..8f1936fa
--- /dev/null
+++ b/common/components/Header/components/Navigation.scss
@@ -0,0 +1,116 @@
+@import "common/sass/variables";
+
+.Navigation {
+ position: relative;
+ overflow-y: hidden;
+
+ &-scroll {
+ -ms-overflow-style: -ms-autohiding-scrollbar;
+ -webkit-overflow-scrolling: touch;
+ overflow-x: auto;
+ margin-bottom: -20px;
+ font-size: 0;
+ white-space: nowrap;
+ @media screen and (max-width: $screen-sm) {
+ margin: 0 -5% -20px;
+ }
+ }
+
+ &-links {
+ border-bottom: 2px solid $gray-lighter;
+ display: inline-block;
+ font-size: 0;
+ margin-bottom: 20px;
+ min-width: 100%;
+ padding: 5px 0 0;
+ vertical-align: middle;
+
+ &-item {
+ display: inline-block;
+ font-size: 0;
+
+ &-link {
+ color: darken($link-color, 15%);
+ display: block;
+ font-size: 16px;
+ font-weight: 300;
+ padding: 10px;
+ white-space: nowrap;
+ position: relative;
+ min-height: 2.75rem;
+
+ &:after {
+ content: "";
+ background: $brand-primary;
+ height: 2px;
+ width: 100%;
+ left: 0px;
+ position: absolute;
+ bottom: -1px;
+ transition: all 250ms ease 0s;
+ transform: scaleX(0);
+ }
+
+ &.is-active,
+ &:hover,
+ &:focus {
+ color: $brand-primary;
+ text-decoration: none;
+ transition: all 250ms ease 0s;
+
+ &:after {
+ transform: scaleX(1);
+ transition: all 250ms ease 0s;
+ }
+ }
+ }
+ }
+ }
+
+ &-arrow {
+ background-color: white;
+ bottom: 12px;
+ color: #d6d6d6;
+ font-size: 33px;
+ line-height: 1.3;
+ min-width: 50px;
+ position: absolute;
+ top: 0;
+ vertical-align: middle;
+ width: 5%;
+ z-index: 999;
+ &:hover {
+ text-decoration: none;
+ }
+
+ &--left {
+ left: 3%;
+ background: linear-gradient(
+ to left,
+ rgba(255, 255, 255, 0) 0%,
+ rgba(255, 255, 255, 1) 47%,
+ rgba(255, 255, 255, 1) 100%
+ );
+ padding-left: 5px;
+ text-align: left;
+ @media screen and (max-width: $screen-sm) {
+ left: 0;
+ }
+ }
+
+ &--right {
+ right: 3%;
+ background: linear-gradient(
+ to right,
+ rgba(255, 255, 255, 0) 0%,
+ rgba(255, 255, 255, 1) 47%,
+ rgba(255, 255, 255, 1) 100%
+ );
+ padding-right: 5px;
+ text-align: right;
+ @media screen and (max-width: $screen-sm) {
+ right: 0;
+ }
+ }
+ }
+}
diff --git a/common/components/Header/components/TabsOptions.jsx b/common/components/Header/components/TabsOptions.jsx
deleted file mode 100644
index fd7f8bbd..00000000
--- a/common/components/Header/components/TabsOptions.jsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import React, { Component } from 'react';
-import { Link } from 'react-router';
-import translate from 'translations';
-import PropTypes from 'prop-types';
-
-const tabs = [
- {
- name: 'NAV_GenerateWallet',
- link: '/'
- },
- {
- name: 'NAV_SendEther',
- link: 'send-transaction'
- },
- {
- name: 'NAV_Swap',
- link: 'swap'
- },
- {
- name: 'NAV_Offline'
- },
- {
- name: 'NAV_Contracts'
- },
- {
- name: 'NAV_ViewWallet',
- link: 'view-wallet'
- },
- {
- name: 'NAV_Help',
- link: 'help'
- }
-];
-
-export default class TabsOptions extends Component {
- constructor(props) {
- super(props);
- this.state = {
- showLeftArrow: false,
- showRightArrow: false
- };
- }
-
- static propTypes = {
- location: PropTypes.object
- };
-
- tabClick() {}
-
- scrollLeft() {}
-
- scrollRight() {}
-
- render() {
- const { location } = this.props;
- return (
-
-
- {this.state.showLeftArrow &&
- this.scrollLeft(100)}
- >
- «
- }
-
-
- {tabs.map((object, i) => {
- // if the window pathname is the same or similar to the tab objects name, set the active toggle
- const activeOrNot = location.pathname === object.link ||
- location.pathname.substring(1) === object.link
- ? 'active'
- : '';
- return (
-
-
- );
- })}
-
-
this.scrollRight(100)}
- >
- »
- }
-
-
- );
- }
-}
diff --git a/common/components/Header/index.jsx b/common/components/Header/index.jsx
index cb53a5a9..655fc2c9 100644
--- a/common/components/Header/index.jsx
+++ b/common/components/Header/index.jsx
@@ -1,13 +1,16 @@
// @flow
import React, { Component } from 'react';
-import TabsOptions from './components/TabsOptions';
+import Navigation from './components/Navigation';
import { Link } from 'react-router';
import { Dropdown } from 'components/ui';
import { languages, NODES } from '../../config/data';
import logo from 'assets/images/logo-myetherwallet.svg';
+import './index.scss';
+
export default class Header extends Component {
props: {
+ location: {},
languageSelection: string,
nodeSelection: string,
@@ -22,17 +25,28 @@ export default class Header extends Component {
const selectedNode = NODES[nodeSelection];
return (
-
-
-
-
+
+
+
+
Open-Source & Client-Side Ether Wallet ยท v3.6.0
-
+
-
);
}
diff --git a/common/components/Header/index.scss b/common/components/Header/index.scss
new file mode 100644
index 00000000..8df081c9
--- /dev/null
+++ b/common/components/Header/index.scss
@@ -0,0 +1,109 @@
+@import "common/sass/variables";
+@import "common/sass/mixins";
+
+$small-size: 900px;
+
+@mixin small-query {
+ @media screen and (max-width: $small-size) {
+ @content;
+ }
+}
+
+@mixin big-query {
+ @media screen and (min-width: $small-size + 1) {
+ @content;
+ }
+}
+
+// Header
+.Header {
+ &-branding {
+ color: white;
+ padding: 0;
+ @include bg-gradient;
+
+ @include small-query {
+ text-align: center;
+ }
+
+ &-inner {
+ display: flex;
+ align-items: center;
+ @include small-query {
+ flex-direction: column;
+ padding-left: $cont-padding;
+ padding-right: $cont-padding;
+ }
+ }
+
+ &-title {
+ @include big-query {
+ flex-basis: 245px;
+ }
+
+ &-logo {
+ max-width: 1000px;
+ padding: 5px 0;
+ min-width: 220px;
+ }
+
+ &-tagline {
+ font-size: 18px;
+ font-weight: 200;
+ color: white;
+ flex: 1 auto;
+ text-align: right;
+ padding: 5px 0;
+ @include small-query {
+ text-align: center;
+ }
+ > * {
+ display: inline;
+ vertical-align: middle;
+ }
+ }
+ }
+
+ a {
+ color: white;
+ cursor: pointer;
+ font-weight: 400;
+ transition: 250ms all ease;
+
+ &:hover,
+ &:active {
+ opacity: .8;
+ color: white;
+ text-decoration: none;
+ transition: 250ms all ease;
+ }
+ }
+
+ // TODO - Move to dropdown component?
+ .dropdown {
+ margin-left: 15px;
+ padding: 0;
+ text-align: right;
+ white-space: nowrap;
+
+ .dropdown-menu {
+ right: -10px;
+ left: auto;
+ min-width: auto;
+ left: auto;
+
+ & > li > a {
+ font-size: 15px;
+ padding: 5px 30px 5px 15px;
+ position: relative;
+
+ &.active {
+ text-decoration: none;
+ color: $brand-primary;
+ background-color: $gray-lightest;
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/common/sass/mixins.scss b/common/sass/mixins.scss
new file mode 100644
index 00000000..aea6e447
--- /dev/null
+++ b/common/sass/mixins.scss
@@ -0,0 +1,6 @@
+@import "./variables";
+
+@mixin bg-gradient {
+ background: $ether-navy;
+ background: linear-gradient(149deg, #132a45, #143a56, #21a4ce, #19b4ad);
+}
diff --git a/common/sass/variables.scss b/common/sass/variables.scss
new file mode 100644
index 00000000..aca3472c
--- /dev/null
+++ b/common/sass/variables.scss
@@ -0,0 +1,281 @@
+@import "./variables/colors";
+@import "./variables/spacing";
+@import "./variables/typography";
+
+// Transitions
+$transition: 500ms all ease-in-out;
+
+// Links
+$link-color: $brand-primary;
+$link-hover-color: darken($link-color, 5%);
+$link-hover-decoration: none;
+
+// Tables
+$table-cell-padding: $space-sm;
+$table-condensed-cell-padding: $space-xs;
+
+$table-bg: transparent;
+$table-bg-accent: #f9f9f9;
+$table-bg-hover: $gray-lightest;
+$table-bg-active: $table-bg-hover;
+
+$table-border-color: #ddd;
+
+// Buttons
+$btn-font-weight: normal;
+
+$btn-default-color: #333;
+$btn-default-bg: #ececec;
+$btn-default-border: $gray-lighter;
+
+$btn-primary-color: #fff;
+$btn-primary-bg: $brand-primary;
+$btn-primary-border: darken($btn-primary-bg, 5%);
+
+$btn-success-color: #fff;
+$btn-success-bg: $brand-success;
+$btn-success-border: darken($btn-success-bg, 5%);
+
+$btn-info-color: #fff;
+$btn-info-bg: $brand-info;
+$btn-info-border: darken($btn-info-bg, 5%);
+
+$btn-warning-color: #fff;
+$btn-warning-bg: $brand-warning;
+$btn-warning-border: darken($btn-warning-bg, 5%);
+
+$btn-danger-color: #fff;
+$btn-danger-bg: $brand-danger;
+$btn-danger-border: darken($btn-danger-bg, 5%);
+
+$btn-link-disabled-color: $gray-light;
+
+// Forms
+$input-bg: #fff;
+$input-bg-disabled: $gray-lightest;
+
+$input-color: $gray;
+$input-border: $gray-lighter;
+
+$input-border-focus: $brand-primary;
+
+$input-color-placeholder: darken($gray-lighter, 10%);
+
+$input-height-base: 2.55rem;
+$input-height-large: 4rem;
+$input-height-small: 2rem;
+
+$form-group-margin-bottom: $space-sm;
+
+$legend-color: $gray-dark;
+$legend-border-color: #e5e5e5;
+
+$input-group-addon-bg: $gray-lighter;
+$input-group-addon-border-color: $input-border;
+
+// Misc.
+$cursor-disabled: default;
+
+$dropdown-bg: #fff;
+$dropdown-border: rgba(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-bg: $gray-lightest;
+
+$dropdown-link-active-color: $component-active-color;
+$dropdown-link-active-bg: $component-active-bg;
+
+$dropdown-link-disabled-color: $gray-light;
+
+$dropdown-header-color: $gray-light;
+
+$dropdown-caret-color: #000;
+
+$zindex-navbar: 1000;
+$zindex-dropdown: 1000;
+$zindex-popover: 1060;
+$zindex-tooltip: 1070;
+$zindex-navbar-fixed: 1030;
+$zindex-modal-background: 1040;
+$zindex-modal: 1050;
+$zindex-alerts: 1060;
+
+$screen-xs: 32rem;
+$screen-xs-min: $screen-xs;
+
+$screen-sm: 51.2rem;
+$screen-sm-min: $screen-sm;
+
+$screen-md: 66.133333333rem;
+$screen-md-min: $screen-md;
+
+$screen-lg: 80rem;
+$screen-lg-min: $screen-lg;
+
+$screen-xl: 94rem;
+$screen-xl-min: $screen-xl;
+
+$screen-xs-max: ($screen-sm-min - 1);
+$screen-sm-max: ($screen-md-min - 1);
+$screen-md-max: ($screen-lg-min - 1);
+$screen-lg-max: ($screen-xl-min - 1);
+
+$grid-columns: 12;
+$grid-gutter-width: 3rem;
+$grid-float-breakpoint: $screen-sm-min;
+$grid-float-breakpoint-max: ($grid-float-breakpoint - 1);
+
+$cont-padding: 5%;
+$cont-padding-lg: 7.5%;
+
+$container-tablet: ($screen-sm + $grid-gutter-width);
+$container-sm: $container-tablet;
+
+$container-desktop: ($screen-md + $grid-gutter-width);
+$container-md: $container-desktop;
+
+$container-large-desktop: ($screen-lg + $grid-gutter-width);
+$container-lg: $container-large-desktop;
+
+$state-success-text: darken($brand-success, 10%);
+$state-success-bg: #dff0d8;
+$state-success-border: darken(adjust-hue($state-success-bg, -10deg), 5%);
+
+$state-info-text: darken($brand-info, 10%);
+$state-info-bg: #d9edf7;
+$state-info-border: darken(adjust-hue($state-info-bg, -10deg), 7%);
+
+$state-warning-text: darken($brand-warning, 10%);
+$state-warning-bg: #fcf8e3;
+$state-warning-border: darken(adjust-hue($state-warning-bg, -10deg), 5%);
+
+$state-danger-text: darken($brand-danger, 10%);
+$state-danger-bg: #f2dede;
+$state-danger-border: darken(adjust-hue($state-danger-bg, -10deg), 5%);
+
+$tooltip-max-width: 200px;
+$tooltip-color: #fff;
+$tooltip-bg: #000;
+$tooltip-opacity: .9;
+
+$tooltip-arrow-width: $space-sm;
+$tooltip-arrow-color: $tooltip-bg;
+
+$label-default-bg: $gray-light;
+$label-primary-bg: $brand-primary;
+$label-success-bg: $brand-success;
+$label-info-bg: $brand-info;
+$label-warning-bg: $brand-warning;
+$label-danger-bg: $brand-danger;
+
+$label-color: #fff;
+$label-link-hover-color: #fff;
+
+$modal-inner-padding: $space*1.5;
+
+$modal-title-padding: $space;
+$modal-title-line-height: $line-height-base;
+
+$modal-content-bg: #fff;
+$modal-content-border-color: rgba(0, 0, 0, .2);
+$modal-content-fallback-border-color: #999;
+
+$modal-backdrop-bg: #000;
+$modal-backdrop-opacity: .5;
+$modal-header-border-color: #e5e5e5;
+$modal-footer-border-color: $modal-header-border-color;
+
+$modal-lg: 70rem;
+$modal-md: 50rem;
+$modal-sm: 30rem;
+
+$alert-border-radius: $border-radius;
+$alert-link-font-weight: bold;
+
+$alert-success-bg: $brand-success;
+$alert-success-text: white;
+$alert-success-border: $alert-success-bg;
+
+$alert-info-bg: $brand-primary;
+$alert-info-text: white;
+$alert-info-border: $alert-info-bg;
+
+$alert-warning-bg: $brand-warning;
+$alert-warning-text: white;
+$alert-warning-border: $alert-warning-bg;
+
+$alert-danger-bg: $brand-danger;
+$alert-danger-text: white;
+$alert-danger-border: $alert-danger-bg;
+
+$progress-bg: $gray-lightest;
+$progress-bar-color: #fff;
+$progress-border-radius: $border-radius;
+
+$progress-bar-bg: $brand-primary;
+$progress-bar-success-bg: $brand-success;
+$progress-bar-warning-bg: $brand-warning;
+$progress-bar-danger-bg: $brand-danger;
+$progress-bar-info-bg: $brand-info;
+
+$list-group-bg: #fff;
+$list-group-border: #ddd;
+$list-group-border-radius: $border-radius;
+
+$list-group-hover-bg: $gray-lightest;
+$list-group-active-color: $component-active-color;
+$list-group-active-bg: $component-active-bg;
+$list-group-active-border: $list-group-active-bg;
+$list-group-active-text-color: lighten($list-group-active-bg, 40%);
+
+$list-group-disabled-color: $gray-light;
+$list-group-disabled-bg: $gray-lighter;
+$list-group-disabled-text-color: $list-group-disabled-color;
+
+$list-group-link-color: #555;
+$list-group-link-hover-color: $list-group-link-color;
+$list-group-link-heading-color: #333;
+
+$thumbnail-padding: 4px;
+$thumbnail-bg: $body-bg;
+$thumbnail-border: #ddd;
+$thumbnail-border-radius: $border-radius;
+
+$thumbnail-caption-color: $text-color;
+$thumbnail-caption-padding: 9px;
+
+$well-bg: $gray-lightest;
+$well-border: darken($well-bg, 7%);
+
+$badge-font-weight: bold;
+$badge-line-height: 1;
+$badge-border-radius: 10px;
+
+$close-font-weight: bold;
+$close-color: #000;
+$close-text-shadow: 0 1px 0 #fff;
+
+$code-color: #c7254e;
+$code-bg: #f9f2f4;
+
+$kbd-color: #fff;
+$kbd-bg: #333;
+
+$pre-bg: $gray-lightest;
+$pre-color: $gray-dark;
+$pre-border-color: $gray-lighter;
+$pre-scrollable-max-height: 340px;
+
+$component-offset-horizontal: 180px;
+$text-muted: $gray-light;
+$abbr-border-color: $gray-light;
+$headings-small-color: inherit;
+$blockquote-small-color: $gray-light;
+$blockquote-font-size: ($font-size-base * 1.25);
+$blockquote-border-color: $gray-lighter;
+$page-header-border-color: $gray-lighter;
+$dl-horizontal-offset: $component-offset-horizontal;
+$hr-border: $gray-lighter;
diff --git a/common/sass/variables/colors.scss b/common/sass/variables/colors.scss
new file mode 100644
index 00000000..ab0957ec
--- /dev/null
+++ b/common/sass/variables/colors.scss
@@ -0,0 +1,19 @@
+$ether-navy: #163151;
+$ether-blue: #0e97c0;
+
+$gray-base: #000;
+$gray-darker: lighten($gray-base, 13.5%);
+$gray-dark: lighten($gray-base, 20%);
+$gray: #737373;
+$gray-light: #9a9a9a;
+$gray-lighter: #ececec;
+$gray-lightest: #fafafa;
+
+$brand-primary: $ether-blue;
+$brand-success: #5dba5a;
+$brand-info: $ether-navy;
+$brand-warning: #ff9800;
+$brand-danger: #ea4b40;
+
+$body-bg: #fff;
+$text-color: $gray-dark;
diff --git a/common/sass/variables/spacing.scss b/common/sass/variables/spacing.scss
new file mode 100644
index 00000000..3a40d032
--- /dev/null
+++ b/common/sass/variables/spacing.scss
@@ -0,0 +1,29 @@
+$space-xs: 0.25rem;
+$space-sm: 0.50rem;
+$space-md: 0.75rem;
+$space: 1.00rem;
+$space-lg: 1.50rem;
+$space-xl: 2.00rem;
+
+$padding-base-vertical: $space * 0.6;
+$padding-base-horizontal: $space;
+
+$padding-large-vertical: $space-md;
+$padding-large-horizontal: $space-xl;
+
+$padding-small-vertical: 0.1rem;
+$padding-small-horizontal: $space-sm;
+
+$padding-xs-vertical: $space-xs;
+$padding-xs-horizontal: 0.2rem;
+
+$line-height-large: 1.2;
+$line-height-small: 1.5;
+
+$border-radius: 2px;
+
+$component-active-color: #fff;
+$component-active-bg: $brand-primary;
+
+$caret-width-base: $space-xs;
+$caret-width-large: $space-xs;
diff --git a/common/sass/variables/typography.scss b/common/sass/variables/typography.scss
new file mode 100644
index 00000000..8fde9bf4
--- /dev/null
+++ b/common/sass/variables/typography.scss
@@ -0,0 +1,22 @@
+$font-family-sans-serif: 'Lato', sans-serif;
+$font-family-serif: Georgia, "Times New Roman", Times, serif;
+$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
+$font-family-base: $font-family-sans-serif;
+
+$base: 15;
+$font-size-pixels: $base + px;
+$font-size-pixels-xl: $base + 1px; // for xl screens
+$font-size-pixels-sm: $base + px; // for small screens
+
+$font-size-large-bump: 2.25rem; // 33.75
+$font-size-large: 1.90rem; // 28.5
+$font-size-medium-bump: 1.50rem; // 22.5
+$font-size-medium: 1.30rem; // 19.5
+$font-size-bump-more: 1.15rem; // 17.25
+$font-size-bump: 1.07rem; // 16.05
+$font-size-base: 1.00rem; // 15
+$font-size-small: 0.92rem; // 13.8
+$font-size-xs: 0.80rem; // 12
+
+$line-height-base: 1.4;
+$line-height-computed: 1.4;
diff --git a/webpack_config/webpack.base.js b/webpack_config/webpack.base.js
index e3a979a1..ddb318cc 100644
--- a/webpack_config/webpack.base.js
+++ b/webpack_config/webpack.base.js
@@ -20,19 +20,9 @@ module.exports = {
},
resolve: {
extensions: ['.js', '.jsx', '.css', '.json', '.scss', '.less'],
- alias: {
- actions: `${config.srcPath}/actions/`,
- api: `${config.srcPath}/api/`,
- reducers: `${config.srcPath}/reducers/`,
- components: `${config.srcPath}/components/`,
- containers: `${config.srcPath}/containers/`,
- styles: `${config.srcPath}/styles/`,
- less_vars: `${config.srcPath}/styles/etherwallet-variables.less`
- },
- // FIXME why aliases then?
modules: [
// places where to search for required modules
- _.cwd('common'),
+ config.srcPath,
_.cwd('node_modules'),
_.cwd('./')
]