grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove signer icons (#3039)

Browse Source 
* Remove signer icons

* Linting fixes
This commit is contained in:
Jaco Greeff 2016-11-01 11:11:20 +01:00 committed by Gav Wood
parent 42010acd68
commit 71662bb219
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/views/ParityBar/parityBar.css
View File

@ -91,6 +91,10 @@
overflow: visible !important; overflow: visible !important;
} }
.button svg {
fill: white !important;
}
.label { .label {
position: relative; position: relative;
display: inline-block; display: inline-block;

5
js/src/views/ParityBar/parityBar.js
View File

@ -18,9 +18,10 @@ import React, { Component, PropTypes } from 'react';
import { Link } from 'react-router'; import { Link } from 'react-router';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { bindActionCreators } from 'redux'; import { bindActionCreators } from 'redux';
import ActionFingerprint from 'material-ui/svg-icons/action/fingerprint';
import ContentClear from 'material-ui/svg-icons/content/clear'; 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 { Embedded as Signer } from '../Signer';
import imagesEthcoreBlock from '../../../assets/images/ethcore-block.png'; import imagesEthcoreBlock from '../../../assets/images/ethcore-block.png';
@ -84,7 +85,7 @@ class ParityBar extends Component {
</Link> </Link>
<Button <Button
className={ styles.button } className={ styles.button }
icon={ <SignerIcon className={ styles.signerIcon } /> } icon={ <ActionFingerprint /> }
label={ this.renderSignerLabel() } label={ this.renderSignerLabel() }
onClick={ this.toggleDisplay } /> onClick={ this.toggleDisplay } />
</div> </div>

7
js/src/views/Settings/Views/defaults.js
View File

@ -16,16 +16,13 @@
import React from 'react'; import React from 'react';
import ActionAccountBalanceWallet from 'material-ui/svg-icons/action/account-balance-wallet'; 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 ActionTrackChanges from 'material-ui/svg-icons/action/track-changes';
import ActionSettings from 'material-ui/svg-icons/action/settings'; import ActionSettings from 'material-ui/svg-icons/action/settings';
import CommunicationContacts from 'material-ui/svg-icons/communication/contacts'; import CommunicationContacts from 'material-ui/svg-icons/communication/contacts';
import ImageGridOn from 'material-ui/svg-icons/image/grid-on'; import ImageGridOn from 'material-ui/svg-icons/image/grid-on';
import NavigationApps from 'material-ui/svg-icons/navigation/apps'; import NavigationApps from 'material-ui/svg-icons/navigation/apps';
import { SignerIcon } from '../../../ui';
import styles from './views.css';
const defaultViews = { const defaultViews = {
accounts: { accounts: {
active: true, active: true,
@ -76,7 +73,7 @@ const defaultViews = {
signer: { signer: {
active: true, active: true,
fixed: true, fixed: true,
icon: <SignerIcon className={ styles.signerIcon } />, icon: <ActionFingerprint />,
label: 'Signer', label: 'Signer',
route: '/signer', route: '/signer',
value: 'signer', value: 'signer',

1
js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/TransactionPendingFormConfirm.css
View File

@ -21,6 +21,7 @@
.confirmButton { .confirmButton {
display: block !important; display: block !important;
margin-bottom: 10px; margin-bottom: 10px;
white-space: nowrap;
} }
.signerIcon { .signerIcon {

4
js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/TransactionPendingFormConfirm.js
View File

@ -20,7 +20,7 @@ import { bindActionCreators } from 'redux';
import RaisedButton from 'material-ui/RaisedButton'; import RaisedButton from 'material-ui/RaisedButton';
import ReactTooltip from 'react-tooltip'; import ReactTooltip from 'react-tooltip';
import { Form, Input, SignerIcon } from '../../../../../ui'; import { Form, Input, IdentityIcon } from '../../../../../ui';
import styles from './TransactionPendingFormConfirm.css'; import styles from './TransactionPendingFormConfirm.css';
@ -72,7 +72,7 @@ class TransactionPendingFormConfirm extends Component {
fullWidth fullWidth
primary primary
disabled={ isSending } disabled={ isSending }
icon={ <SignerIcon className={ styles.signerIcon } /> } icon={ <IdentityIcon address={ address } button className={ styles.signerIcon } /> }
label={ isSending ? 'Confirming...' : 'Confirm Transaction' } label={ isSending ? 'Confirming...' : 'Confirm Transaction' }
/> />
</div> </div>