Merge pull request #2669 from ethcore/signer-fix-txhash

Styling in FF is not 100%
openethereum · Oct 17, 2016 · 12b115b · 12b115b
2 parents 6122231 + 294ac23
commit 12b115b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/js/src/views/Application/TabBar/tabBar.js b/js/src/views/Application/TabBar/tabBar.js
@@ -20,7 +20,7 @@ import { bindActionCreators } from 'redux';
 import { Toolbar, ToolbarGroup } from 'material-ui/Toolbar';
 import { Tabs, Tab } from 'material-ui/Tabs';
 
-import { Badge, ParityBackground, Tooltip } from '../../../ui';
+import { Badge, Tooltip } from '../../../ui';
 
 import styles from './tabBar.css';
 import imagesEthcoreBlock from '../../../../assets/images/ethcore-block.png';
@@ -50,14 +50,12 @@ class TabBar extends Component {
 
   render () {
     return (
-      <ParityBackground>
-        <Toolbar
-          className={ styles.toolbar }>
-          { this.renderLogo() }
-          { this.renderTabs() }
-          { this.renderLast() }
-        </Toolbar>
-      </ParityBackground>
+      <Toolbar
+        className={ styles.toolbar }>
+        { this.renderLogo() }
+        { this.renderTabs() }
+        { this.renderLast() }
+      </Toolbar>
     );
   }
 

diff --git a/js/src/views/Signer/components/SignRequest/SignRequest.css b/js/src/views/Signer/components/SignRequest/SignRequest.css
@@ -56,6 +56,7 @@
 }
 
 .txHash {
+  display: block;
   word-break: break-all;
 }
 

diff --git a/js/src/views/Signer/components/SignRequest/SignRequest.js b/js/src/views/Signer/components/SignRequest/SignRequest.js
@@ -76,7 +76,7 @@ export default class SignRequest extends Component {
           <div className={ styles.actions }>
             <span className={ styles.isConfirmed }>Confirmed</span>
             <div>
-              Transaction hash: <br />
+              Transaction hash:
               <TxHashLink chain={ chain } txHash={ hash } className={ styles.txHash } />
             </div>
           </div>

diff --git a/js/src/views/Signer/components/TransactionFinished/TransactionFinished.css b/js/src/views/Signer/components/TransactionFinished/TransactionFinished.css
@@ -50,5 +50,6 @@
 }
 
 .txHash {
+  display: block;
   word-break: break-all;
 }
diff --git a/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js b/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
@@ -98,7 +98,7 @@ export default class TransactionFinished extends Component {
 
     return (
       <div>
-        Transaction hash: <br />
+        Transaction hash:
         <TxHashLink chain={ chain } txHash={ txHash } className={ styles.txHash } />
       </div>
     );
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,7 @@ @@
     }
     .txHash {
+      display: block;
       word-break: break-all;
     }
@@ Expand Down @@