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

Commit

Permalink
tweak TOS for ledger
Browse files Browse the repository at this point in the history
close #11942
Auditors: @bsclifton
  • Loading branch information
cezaraugusto committed Nov 15, 2017
1 parent c6a2937 commit 67f450b
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 11 deletions.
1 change: 1 addition & 0 deletions app/extensions/brave/locales/en-US/preferences.properties
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ tabs=Tabs
tabSettings=Tab Settings
tabsPerTabPage=Number of tabs per tab set:
tabsSettings=Tabs Settings
termsOfService=Terms of Service
timeSpent=Time Spent
toolbarUserInterfaceScale=Toolbar and UI elements scale
totalAmount=Total Amount
Expand Down
38 changes: 27 additions & 11 deletions app/renderer/components/preferences/payment/disabledContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,25 @@ const uphold2 = require('../../../../extensions/brave/img/ledger/uphold_logo_med
class DisabledContent extends ImmutableComponent {
render () {
return <section className={css(styles.disabledContent)} data-test-id='disabledContent'>
<div className={css(styles.disabledContent__message)} data-test-id='paymentsMessage'>
<h3 className={css(styles.disabledContent__message__header)} data-l10n-id='paymentsWelcomeTitle' />
<div className={css(styles.disabledContent__message__text)} data-l10n-id='paymentsWelcomeText1' />
<div className={css(styles.disabledContent__message__text, styles.disabledContent__message__text_bold)} data-l10n-id='paymentsWelcomeText2' />
<div className={css(styles.disabledContent__message__text)} data-l10n-id='paymentsWelcomeText3' />
<div className={css(styles.disabledContent__message__text)} data-l10n-id='paymentsWelcomeText4' />
<div className={css(styles.disabledContent__message__text)} data-l10n-id='paymentsWelcomeText5' />
<div className={css(styles.disabledContent__message__text)}>
<span data-l10n-id='paymentsWelcomeText6' />&nbsp;
<a className={css(commonStyles.linkText)} href='https://brave.com/Payments_FAQ.html' rel='noopener' target='_blank' data-l10n-id='paymentsWelcomeLink' />&nbsp;
<span data-l10n-id='paymentsWelcomeText7' />
<div>
<div className={css(styles.disabledContent__message)} data-test-id='paymentsMessage'>
<h3 className={css(styles.disabledContent__message__header)} data-l10n-id='paymentsWelcomeTitle' />
<div className={css(styles.disabledContent__message__text)} data-l10n-id='paymentsWelcomeText1' />
<div className={css(styles.disabledContent__message__text, styles.disabledContent__message__text_bold)} data-l10n-id='paymentsWelcomeText2' />
<div className={css(styles.disabledContent__message__text)} data-l10n-id='paymentsWelcomeText3' />
<div className={css(styles.disabledContent__message__text)} data-l10n-id='paymentsWelcomeText4' />
<div className={css(styles.disabledContent__message__text)} data-l10n-id='paymentsWelcomeText5' />
<div className={css(styles.disabledContent__message__text)}>
<span data-l10n-id='paymentsWelcomeText6' />&nbsp;
<a className={css(commonStyles.linkText)} href='https://brave.com/Payments_FAQ.html' rel='noopener' target='_blank' data-l10n-id='paymentsWelcomeLink' />&nbsp;
<span data-l10n-id='paymentsWelcomeText7' />
</div>
</div>
<a data-l10n-id='termsOfService'
className={css(styles.disabledContent__message__toc)}
href='https://basicattentiontoken.org/contributor-terms-of-service/'
target='_blank'
rel='noreferrer noopener' />
</div>
<div className={css(styles.disabledContent__sidebar)}>
<h2 className={css(styles.disabledContent__sidebar__header)} data-l10n-id='paymentsSidebarText1' />
Expand Down Expand Up @@ -74,6 +81,15 @@ const styles = StyleSheet.create({
fontWeight: 'bold'
},

disabledContent__message__toc: {
display: 'flex',
flex: 1,
justifyContent: 'flex-end',
fontSize: '13px',
color: '#666',
padding: '20px 0'
},

disabledContent__sidebar: {
minWidth: '200px',
marginLeft: '35px'
Expand Down
12 changes: 12 additions & 0 deletions app/renderer/components/preferences/payment/enabledContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,11 @@ class EnabledContent extends ImmutableComponent {
settings={this.props.settings}
onChangeSetting={this.props.onChangeSetting}
siteSettings={this.props.siteSettings} />
<a data-l10n-id='termsOfService'
className={css(styles.enabledContent__tos)}
href='https://basicattentiontoken.org/contributor-terms-of-service/'
target='_blank'
rel='noreferrer noopener' />
</section>
}
}
Expand Down Expand Up @@ -336,6 +341,13 @@ const styles = StyleSheet.create({
zIndex: 2
},

enabledContent__tos: {
float: 'right',
fontSize: '13px',
color: '#666',
padding: '20px 60px'
},

enabledContent__loader: {
background: '#fafafa',
zIndex: 3,
Expand Down

0 comments on commit 67f450b

Please sign in to comment.