Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Remove signer icons #3039

Merged
merged 2 commits into from
Nov 1, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions js/src/views/ParityBar/parityBar.css
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@
overflow: visible !important;
}

.button svg {
fill: white !important;
}

.label {
position: relative;
display: inline-block;
Expand Down
5 changes: 3 additions & 2 deletions js/src/views/ParityBar/parityBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ import React, { Component, PropTypes } from 'react';
import { Link } from 'react-router';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import ActionFingerprint from 'material-ui/svg-icons/action/fingerprint';
import ContentClear from 'material-ui/svg-icons/content/clear';

import { Badge, Button, ContainerTitle, ParityBackground, SignerIcon } from '../../ui';
import { Badge, Button, ContainerTitle, ParityBackground } from '../../ui';
import { Embedded as Signer } from '../Signer';

import imagesEthcoreBlock from '../../../assets/images/ethcore-block.png';
Expand Down Expand Up @@ -84,7 +85,7 @@ class ParityBar extends Component {
</Link>
<Button
className={ styles.button }
icon={ <SignerIcon className={ styles.signerIcon } /> }
icon={ <ActionFingerprint /> }
label={ this.renderSignerLabel() }
onClick={ this.toggleDisplay } />
</div>
Expand Down
7 changes: 2 additions & 5 deletions js/src/views/Settings/Views/defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,13 @@

import React from 'react';
import ActionAccountBalanceWallet from 'material-ui/svg-icons/action/account-balance-wallet';
import ActionFingerprint from 'material-ui/svg-icons/action/fingerprint';
import ActionTrackChanges from 'material-ui/svg-icons/action/track-changes';
import ActionSettings from 'material-ui/svg-icons/action/settings';
import CommunicationContacts from 'material-ui/svg-icons/communication/contacts';
import ImageGridOn from 'material-ui/svg-icons/image/grid-on';
import NavigationApps from 'material-ui/svg-icons/navigation/apps';

import { SignerIcon } from '../../../ui';

import styles from './views.css';

const defaultViews = {
accounts: {
active: true,
Expand Down Expand Up @@ -76,7 +73,7 @@ const defaultViews = {
signer: {
active: true,
fixed: true,
icon: <SignerIcon className={ styles.signerIcon } />,
icon: <ActionFingerprint />,
label: 'Signer',
route: '/signer',
value: 'signer',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
.confirmButton {
display: block !important;
margin-bottom: 10px;
white-space: nowrap;
}

.signerIcon {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { bindActionCreators } from 'redux';
import RaisedButton from 'material-ui/RaisedButton';
import ReactTooltip from 'react-tooltip';

import { Form, Input, SignerIcon } from '../../../../../ui';
import { Form, Input, IdentityIcon } from '../../../../../ui';

import styles from './TransactionPendingFormConfirm.css';

Expand Down Expand Up @@ -72,7 +72,7 @@ class TransactionPendingFormConfirm extends Component {
fullWidth
primary
disabled={ isSending }
icon={ <SignerIcon className={ styles.signerIcon } /> }
icon={ <IdentityIcon address={ address } button className={ styles.signerIcon } /> }
label={ isSending ? 'Confirming...' : 'Confirm Transaction' }
/>
</div>
Expand Down