Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Refactor ledgerBackupContent with Aphrodite #7383

Merged
merged 1 commit into from
Feb 28, 2017
Merged

Refactor ledgerBackupContent with Aphrodite #7383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 42 additions & 10 deletions app/renderer/components/preferences/paymentsTab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ const {changeSetting} = require('../../lib/settingsUtil')
const moment = require('moment')
moment.locale(navigator.language)

const {StyleSheet, css} = require('aphrodite/no-important')
const globalStyles = require('../styles/global')

// Components
const Button = require('../../../../js/components/button')
const {FormTextbox, RecoveryKeyTextbox} = require('../textbox')
Expand Down Expand Up @@ -296,22 +299,22 @@ class PaymentsTab extends ImmutableComponent {
return <div className='board'>
<div className='panel ledgerBackupContent'>
<span data-l10n-id='ledgerBackupContent' />
<div className='copyKeyContainer'>
<div className={css(styles.copyKeyContainer)}>
<div className='copyContainer'>
<Button l10nId='copy' className='copyButton whiteButton' onClick={this.copyToClipboard.bind(this, paymentId)} />
</div>
<div className='keyContainer'>
<h3 data-l10n-id='firstKey' />
<span>{paymentId}</span>
<div className={css(styles.keyContainer)}>
<h3 className={css(styles.keyContainer__h3)} data-l10n-id='firstKey' />
<span className={css(styles.keyContainer__span)}>{paymentId}</span>
</div>
</div>
<div className='copyKeyContainer'>
<div className={css(styles.copyKeyContainer)}>
<div className='copyContainer'>
<Button l10nId='copy' className='copyButton whiteButton' onClick={this.copyToClipboard.bind(this, passphrase)} />
</div>
<div className='keyContainer'>
<h3 data-l10n-id='secondKey' />
<span>{passphrase}</span>
<div className={css(styles.keyContainer)}>
<h3 className={css(styles.keyContainer__h3)} data-l10n-id='secondKey' />
<span className={css(styles.keyContainer__span)}>{passphrase}</span>
</div>
</div>
</div>
Expand Down Expand Up @@ -363,8 +366,8 @@ class PaymentsTab extends ImmutableComponent {
: null
}
<div className='panel recoveryContent'>
<h4 data-l10n-id='ledgerRecoverySubtitle' />
<div className='ledgerRecoveryContent' data-l10n-id='ledgerRecoveryContent' />
<h4 className={css(styles.recoveryContent__h4)} data-l10n-id='ledgerRecoverySubtitle' />
<div className={css(styles.ledgerRecoveryContent)} data-l10n-id='ledgerRecoveryContent' />
<SettingsList>
<SettingItem>
<h3 data-l10n-id='firstRecoveryKey' />
Expand Down Expand Up @@ -608,4 +611,33 @@ function formattedTimeFromNow (timestamp) {
return moment(new Date(timestamp)).fromNow()
}

const styles = StyleSheet.create({
copyKeyContainer: {
display: 'flex',
alignItems: 'flex-end',
width: '75%',
margin: `${globalStyles.spacing.paymentsMargin} auto`
},

keyContainer: {
marginLeft: '2em'
},

keyContainer__h3: {
marginBottom: globalStyles.spacing.modalPanelHeaderMarginBottom
},

keyContainer__span: {
whiteSpace: 'nowrap'
},

recoveryContent__h4: {
marginBottom: globalStyles.spacing.paymentsMargin
},

ledgerRecoveryContent: {
marginBottom: globalStyles.spacing.paymentsMargin
}
})

module.exports = PaymentsTab
4 changes: 3 additions & 1 deletion app/renderer/components/styles/global.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ const globalStyles = {
defaultTabPadding: '0 4px',
defaultIconPadding: '2px',
iconSize: '16px',
dialogTopOffset: '30px'
dialogTopOffset: '30px',
paymentsMargin: '20px',
modalPanelHeaderMarginBottom: '.5em'
},
shadow: {
switchShadow: 'inset 0 1px 4px rgba(0, 0, 0, 0.35)',
Expand Down
21 changes: 3 additions & 18 deletions less/about/preferences.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,7 @@ table.sortableTable {
.dialog-body {
.board {
.panel {
// globalStyles.spacing.modalPanelHeaderMarginBottom in global.js
@margin-bottom-header: .5em;

// This removes the margin which increases the size of the dialog-header
Expand Down Expand Up @@ -537,30 +538,14 @@ table.sortableTable {
}

&.ledgerBackupContent {
.copyKeyContainer {
display: flex;
align-items: flex-end;
width: 75%;
margin: 20px auto;

// TODO: Refactor button.less
div[class^='copyKeyContainer'] {
.copyContainer {
.copyButton {
font-size: 14px;
margin: 0;
}
}

.keyContainer {
margin-left: 2em;

h3 {
margin-bottom: @margin-bottom-header;
}

> span {
white-space: nowrap;
}
}
}
}

Expand Down