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

Styling in FF is not 100% #2669

Merged
merged 2 commits into from
Oct 17, 2016
Merged

Styling in FF is not 100% #2669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15cb4bf
fix txhash rendering in signer
derhuerst Oct 17, 2016
294ac23
remove unnecessary ParityBackground
derhuerst Oct 17, 2016
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
16 changes: 7 additions & 9 deletions js/src/views/Application/TabBar/tabBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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>
);
}

Expand Down
1 change: 1 addition & 0 deletions js/src/views/Signer/components/SignRequest/SignRequest.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
}

.txHash {
display: block;
word-break: break-all;
}

Expand Down
2 changes: 1 addition & 1 deletion js/src/views/Signer/components/SignRequest/SignRequest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions js/src/views/Signer/components/TransactionFinished/TransactionFinished.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,6 @@
}

.txHash {
display: block;
word-break: break-all;
}
2 changes: 1 addition & 1 deletion js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
);
Expand Down