+
{ value }
);
diff --git a/js/src/ui/Balance/balance.css b/js/src/ui/Balance/balance.css
index a9cf6c6a4..43387a53a 100644
--- a/js/src/ui/Balance/balance.css
+++ b/js/src/ui/Balance/balance.css
@@ -25,7 +25,7 @@ $textColor: white;
vertical-align: top;
&:not(.full) {
- height: 2.5em;
+ height: 40px;
overflow: hidden;
}
}
diff --git a/js/src/ui/CopyToClipboard/copyToClipboard.css b/js/src/ui/CopyToClipboard/copyToClipboard.css
index 4e2bb8cc4..4051d8593 100644
--- a/js/src/ui/CopyToClipboard/copyToClipboard.css
+++ b/js/src/ui/CopyToClipboard/copyToClipboard.css
@@ -15,7 +15,8 @@
/* along with Parity. If not, see
.
*/
-.wrapper {
+.icon {
+ cursor: pointer;
display: inline-block;
}
diff --git a/js/src/ui/CopyToClipboard/copyToClipboard.js b/js/src/ui/CopyToClipboard/copyToClipboard.js
index cc18d1556..63eafffd7 100644
--- a/js/src/ui/CopyToClipboard/copyToClipboard.js
+++ b/js/src/ui/CopyToClipboard/copyToClipboard.js
@@ -14,7 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see
.
-import { IconButton } from 'material-ui';
import React, { Component, PropTypes } from 'react';
import { FormattedMessage } from 'react-intl';
import Clipboard from 'react-copy-to-clipboard';
@@ -23,13 +22,10 @@ import { bindActionCreators } from 'redux';
import { showSnackbar } from '@parity/shared/redux/providers/snackbarActions';
-import { CopyIcon } from '../Icons';
-import Theme from '../Theme';
+import { CopyIcon } from '~/ui/Icons';
import styles from './copyToClipboard.css';
-const { textColor, disabledTextColor } = Theme.flatButton;
-
class CopyToClipboard extends Component {
static propTypes = {
showSnackbar: PropTypes.func.isRequired,
@@ -62,7 +58,6 @@ class CopyToClipboard extends Component {
render () {
const { data, size } = this.props;
- const { copied } = this.state;
return (
-
-
-
+
);
diff --git a/js/src/ui/Editor/editor.js b/js/src/ui/Editor/editor.js
index dd87aaa3d..d5811e627 100644
--- a/js/src/ui/Editor/editor.js
+++ b/js/src/ui/Editor/editor.js
@@ -14,14 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see
.
-import React, { PropTypes, Component } from 'react';
-
import 'brace';
+import 'brace/theme/solarized_dark';
+import 'brace/mode/json';
+
+import React, { PropTypes, Component } from 'react';
import AceEditor from 'react-ace';
import { noop } from 'lodash';
-import 'brace/theme/solarized_dark';
-import 'brace/mode/json';
import './mode-solidity';
export default class Editor extends Component {
diff --git a/js/src/ui/Errors/errors.js b/js/src/ui/Errors/errors.js
index 59ce74722..3f0a59157 100644
--- a/js/src/ui/Errors/errors.js
+++ b/js/src/ui/Errors/errors.js
@@ -18,6 +18,7 @@ import React, { Component, PropTypes } from 'react';
import { FormattedMessage } from 'react-intl';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
+
import { Snackbar } from '~/ui/Snackbar';
import { closeErrors } from './actions';
diff --git a/js/src/ui/Icons/index.js b/js/src/ui/Icons/index.js
index 0d05f0ce6..35f98605c 100644
--- a/js/src/ui/Icons/index.js
+++ b/js/src/ui/Icons/index.js
@@ -17,62 +17,62 @@
import React from 'react';
import { Icon } from 'semantic-ui-react';
-export const AccountsIcon = () =>
;
-export const AddIcon = () =>
;
-export const AddressIcon = () =>
;
-export const AppsIcon = () =>
;
-export const AttachFileIcon = () =>
;
-export const BackgroundIcon = () =>
;
-export const CancelIcon = () =>
;
-export const CheckIcon = () =>
;
-export const CloseIcon = () =>
;
-export const CompareIcon = () =>
;
-export const ComputerIcon = () =>
;
-export const ContractIcon = () =>
;
-export const CopyIcon = () =>
;
-export const DashboardIcon = () =>
;
+export const AccountsIcon = (props) =>
;
+export const AddIcon = (props) =>
;
+export const AddressIcon = (props) =>
;
+export const AppsIcon = (props) =>
;
+export const AttachFileIcon = (props) =>
;
+export const BackgroundIcon = (props) =>
;
+export const CancelIcon = (props) =>
;
+export const CheckIcon = (props) =>
;
+export const CloseIcon = (props) =>
;
+export const CompareIcon = (props) =>
;
+export const ComputerIcon = (props) =>
;
+export const ContractIcon = (props) =>
;
+export const CopyIcon = (props) =>
;
+export const DashboardIcon = (props) =>
;
export const DoneIcon = CheckIcon;
-export const DeleteIcon = () =>
;
-export const DevelopIcon = () =>
;
-export const DialIcon = () =>
;
-export const EditIcon = () =>
;
-export const ErrorIcon = () =>
;
-export const EthernetIcon = () =>
;
-export const FileIcon = () =>
;
-export const FileDownloadIcon = () =>
;
-export const FileUploadIcon = () =>
;
-export const FingerprintIcon = () =>
;
-export const GasIcon = () =>
;
-export const GotoIcon = () =>
;
-export const InfoIcon = () =>
;
-export const KeyIcon = () =>
;
-export const KeyboardIcon = () =>
;
-export const LinkIcon = () =>
;
-export const ListIcon = () =>
;
-export const LockedIcon = () =>
;
-export const MembershipIcon = () =>
;
-export const MoveIcon = () =>
;
-export const NextIcon = () =>
;
-export const PauseIcon = () =>
;
-export const PlayIcon = () =>
;
-export const PrevIcon = () =>
;
-export const PrintIcon = () =>
;
-export const QrIcon = () =>
;
-export const RefreshIcon = () =>
;
-export const RemoveIcon = () =>
;
-export const ReorderIcon = () =>
;
-export const ReplayIcon = () =>
;
-export const SaveIcon = () =>
;
-export const SearchIcon = () =>
;
-export const SendIcon = () =>
;
-export const SettingsIcon = () =>
;
-export const SnoozeIcon = () =>
;
-export const SortIcon = () =>
;
-export const StarIcon = () =>
;
-export const StatusIcon = () =>
;
-export const UnlockedIcon = () =>
;
-export const UpdateIcon = () =>
;
-export const UpdateWaitIcon = () =>
;
-export const VisibleIcon = () =>
;
-export const VerifyIcon = () =>
;
-export const VpnIcon = () =>
;
+export const DeleteIcon = (props) =>
;
+export const DevelopIcon = (props) =>
;
+export const DialIcon = (props) =>
;
+export const EditIcon = (props) =>
;
+export const ErrorIcon = (props) =>
;
+export const EthernetIcon = (props) =>
;
+export const FileIcon = (props) =>
;
+export const FileDownloadIcon = (props) =>
;
+export const FileUploadIcon = (props) =>
;
+export const FingerprintIcon = (props) =>
;
+export const GasIcon = (props) =>
;
+export const GotoIcon = (props) =>
;
+export const InfoIcon = (props) =>
;
+export const KeyIcon = (props) =>
;
+export const KeyboardIcon = (props) =>
;
+export const LinkIcon = (props) =>
;
+export const ListIcon = (props) =>
;
+export const LockedIcon = (props) =>
;
+export const MembershipIcon = (props) =>
;
+export const MoveIcon = (props) =>
;
+export const NextIcon = (props) =>
;
+export const PauseIcon = (props) =>
;
+export const PlayIcon = (props) =>
;
+export const PrevIcon = (props) =>
;
+export const PrintIcon = (props) =>
;
+export const QrIcon = (props) =>
;
+export const RefreshIcon = (props) =>
;
+export const RemoveIcon = (props) =>
;
+export const ReorderIcon = (props) =>
;
+export const ReplayIcon = (props) =>
;
+export const SaveIcon = (props) =>
;
+export const SearchIcon = (props) =>
;
+export const SendIcon = (props) =>
;
+export const SettingsIcon = (props) =>
;
+export const SnoozeIcon = (props) =>
;
+export const SortIcon = (props) =>
;
+export const StarIcon = (props) =>
;
+export const StatusIcon = (props) =>
;
+export const UnlockedIcon = (props) =>
;
+export const UpdateIcon = (props) =>
;
+export const UpdateWaitIcon = (props) =>
;
+export const VisibleIcon = (props) =>
;
+export const VerifyIcon = (props) =>
;
+export const VpnIcon = (props) =>
;
diff --git a/js/src/ui/IdentityName/identityName.js b/js/src/ui/IdentityName/identityName.js
index 92997351a..12a864f29 100644
--- a/js/src/ui/IdentityName/identityName.js
+++ b/js/src/ui/IdentityName/identityName.js
@@ -20,7 +20,7 @@ import { connect } from 'react-redux';
import { isNullAddress } from '@parity/shared/util/validation';
-import ShortenedHash from '../ShortenedHash';
+import ShortenedHash from '~/ui/ShortenedHash';
const defaultName = (
.
require('babel-register')({
- ignore: /node_modules\/(?!@parity\/(abi|api|jsonrpc|shared|ui))/
+ ignore: /node_modules\/(?!@parity\/(abi|api|dapps|jsonrpc|shared|shell|views|ui))/
});
diff --git a/js/webpack/rules/parity.js b/js/webpack/rules/parity.js
index 7686a06c8..6b2abd45d 100644
--- a/js/webpack/rules/parity.js
+++ b/js/webpack/rules/parity.js
@@ -16,6 +16,6 @@
module.exports = {
test: /\.js$/,
- include: /node_modules\/@parity\/(abi|api|jsonrpc|shared|ui|wordlist)/,
+ include: /node_modules\/@parity\/(abi|api|dapps|jsonrpc|shared|shell|ui|views|wordlist)/,
use: 'babel-loader'
};