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

make Modal always scrollable (#3667)

Browse Source
This commit is contained in:
Jannis Redmann 2016-11-29 13:50:22 +01:00 committed by Jaco Greeff
parent 5e8f6f271d
commit e667d33778
7 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/modals/DeployContract/deployContract.js
View File

@ -128,7 +128,7 @@ export default class DeployContract extends Component {
title={ title } title={ title }
waiting={ waiting } waiting={ waiting }
visible visible
scroll> >
{ this.renderStep() } { this.renderStep() }
</Modal> </Modal>
); );

1
js/src/modals/LoadContract/loadContract.js
View File

@ -62,7 +62,6 @@ export default class LoadContract extends Component {
title={ title } title={ title }
actions={ this.renderDialogActions() } actions={ this.renderDialogActions() }
visible visible
scroll
> >
{ this.renderBody() } { this.renderBody() }
</Modal> </Modal>

2
js/src/modals/SMSVerification/SMSVerification.js
View File

@ -61,7 +61,7 @@ export default class SMSVerification extends Component {
<Modal <Modal
actions={ this.renderDialogActions(phase, error, isStepValid) } actions={ this.renderDialogActions(phase, error, isStepValid) }
title='verify your account via SMS' title='verify your account via SMS'
visible scroll visible
current={ phase } current={ phase }
steps={ ['Prepare', 'Enter Data', 'Request', 'Enter Code', 'Confirm', 'Done!'] } steps={ ['Prepare', 'Enter Data', 'Request', 'Enter Code', 'Confirm', 'Done!'] }
waiting={ error ? [] : [ 0, 2, 4 ] } waiting={ error ? [] : [ 0, 2, 4 ] }

1
js/src/modals/Transfer/transfer.js
View File

@ -104,7 +104,6 @@ class Transfer extends Component {
steps={ steps } steps={ steps }
waiting={ extras ? [2] : [1] } waiting={ extras ? [2] : [1] }
visible visible
scroll
> >
{ this.renderWarning() } { this.renderWarning() }
{ this.renderPage() } { this.renderPage() }

5
js/src/ui/Modal/modal.js
View File

@ -41,7 +41,6 @@ class Modal extends Component {
compact: PropTypes.bool, compact: PropTypes.bool,
current: PropTypes.number, current: PropTypes.number,
waiting: PropTypes.array, waiting: PropTypes.array,
scroll: PropTypes.bool,
steps: PropTypes.array, steps: PropTypes.array,
title: PropTypes.oneOfType([ title: PropTypes.oneOfType([
PropTypes.node, PropTypes.string PropTypes.node, PropTypes.string
@ -52,7 +51,7 @@ class Modal extends Component {
render () { render () {
const { muiTheme } = this.context; const { muiTheme } = this.context;
const { actions, busy, className, current, children, compact, scroll, steps, waiting, title, visible, settings } = this.props; const { actions, busy, className, current, children, compact, steps, waiting, title, visible, settings } = this.props;
const contentStyle = muiTheme.parity.getBackgroundStyle(null, settings.backgroundSeed); const contentStyle = muiTheme.parity.getBackgroundStyle(null, settings.backgroundSeed);
const header = ( const header = (
<Title <Title
@ -70,7 +69,7 @@ class Modal extends Component {
actions={ actions } actions={ actions }
actionsContainerStyle={ ACTIONS_STYLE } actionsContainerStyle={ ACTIONS_STYLE }
autoDetectWindowHeight={ false } autoDetectWindowHeight={ false }
autoScrollBodyContent={ !!scroll } autoScrollBodyContent
actionsContainerClassName={ styles.actions } actionsContainerClassName={ styles.actions }
bodyClassName={ styles.body } bodyClassName={ styles.body }
contentClassName={ styles.content } contentClassName={ styles.content }

1
js/src/views/Contract/contract.js
View File

@ -165,7 +165,6 @@ class Contract extends Component {
actions={ [ cancelBtn ] } actions={ [ cancelBtn ] }
title={ 'contract details' } title={ 'contract details' }
visible visible
scroll
> >
<div className={ styles.details }> <div className={ styles.details }>
{ this.renderSource(contract) } { this.renderSource(contract) }

2
js/src/views/Dapps/AddDapps/AddDapps.js
View File

@ -50,7 +50,7 @@ export default class AddDapps extends Component {
/> />
] } ] }
visible visible
scroll> >
<div className={ styles.warning } /> <div className={ styles.warning } />
{ this.renderList(store.sortedLocal, 'Applications locally available', 'All applications installed locally on the machine by the user for access by the Parity client.') } { this.renderList(store.sortedLocal, 'Applications locally available', 'All applications installed locally on the machine by the user for access by the Parity client.') }
{ this.renderList(store.sortedBuiltin, 'Applications bundled with Parity', 'Experimental applications developed by the Parity team to show off dapp capabilities, integration, experimental features and to control certain network-wide client behaviour.') } { this.renderList(store.sortedBuiltin, 'Applications bundled with Parity', 'Experimental applications developed by the Parity team to show off dapp capabilities, integration, experimental features and to control certain network-wide client behaviour.') }