Remove signer icons (#3039)

* Remove signer icons * Linting fixes
openethereum · Nov 1, 2016 · 71662bb · 71662bb
1 parent 42010ac
commit 71662bb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/js/src/views/ParityBar/parityBar.css b/js/src/views/ParityBar/parityBar.css
@@ -91,6 +91,10 @@
   overflow: visible !important;
 }
 
+.button svg {
+  fill: white !important;
+}
+
 .label {
   position: relative;
   display: inline-block;

diff --git a/js/src/views/ParityBar/parityBar.js b/js/src/views/ParityBar/parityBar.js
@@ -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';
@@ -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>

diff --git a/js/src/views/Settings/Views/defaults.js b/js/src/views/Settings/Views/defaults.js
@@ -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,
@@ -76,7 +73,7 @@ const defaultViews = {
   signer: {
     active: true,
     fixed: true,
-    icon: <SignerIcon className={ styles.signerIcon } />,
+    icon: <ActionFingerprint />,
     label: 'Signer',
     route: '/signer',
     value: 'signer',

diff --git a/...ts/TransactionPendingForm/TransactionPendingFormConfirm/TransactionPendingFormConfirm.css b/...ts/TransactionPendingForm/TransactionPendingFormConfirm/TransactionPendingFormConfirm.css
@@ -21,6 +21,7 @@
 .confirmButton {
   display: block !important;
   margin-bottom: 10px;
+  white-space: nowrap;
 }
 
 .signerIcon {

diff --git a/...nts/TransactionPendingForm/TransactionPendingFormConfirm/TransactionPendingFormConfirm.js b/...nts/TransactionPendingForm/TransactionPendingFormConfirm/TransactionPendingFormConfirm.js
@@ -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';
 
@@ -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>