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

Commit

Permalink
Update files inside app/renderer/components/preferences
Browse files Browse the repository at this point in the history 
Auditors: @evq

Test Plan:
1. Open about:preferences#plugins
2. Make sure `Adobe` and `wiki` appears as anchor links
3. Open about:preferences#payments
4. Disable payments
5. Make sure `View the FAQ` appears as an anchor link
  • Loading branch information
Suguru Hirahara committed Jul 31, 2017
1 parent 0cb6c16 commit c270b07
Show file tree
Hide file tree
Showing 3 changed files with 16,446 additions and 3 deletions.
3 changes: 2 additions & 1 deletion app/renderer/components/preferences/payment/disabledContent.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const ImmutableComponent = require('../../immutableComponent')

// style
const globalStyles = require('../../styles/global')
const commonStyles = require('../../styles/commonStyles')
const {paymentStyles} = require('../../styles/payment')
const PIA = require('../../../../extensions/brave/img/private_internet_access.png')
const PIA2 = require('../../../../extensions/brave/img/private_internet_access_2x.png')
Expand All @@ -30,7 +31,7 @@ class DisabledContent extends ImmutableComponent {
<div className={css(styles.text)}data-l10n-id='paymentsWelcomeText5' />
<div className={css(styles.text)}>
<span data-l10n-id='paymentsWelcomeText6' />&nbsp;
<a className='linkText' href='https://brave.com/Payments_FAQ.html' target='_blank' data-l10n-id='paymentsWelcomeLink' />&nbsp;
<a className={css(commonStyles.linkText)} href='https://brave.com/Payments_FAQ.html' target='_blank' data-l10n-id='paymentsWelcomeLink' />&nbsp;
<span data-l10n-id='paymentsWelcomeText7' />
</div>
</div>
Expand Down
7 changes: 5 additions & 2 deletions app/renderer/components/preferences/pluginsTab.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ const WidevineInfo = require('../main/widevineInfo')
const flash = appConfig.resourceNames.FLASH
const widevine = appConfig.resourceNames.WIDEVINE

const {css} = require('aphrodite/no-important')
const commonStyles = require('../styles/commonStyles')

const {SettingsList, SettingCheckbox} = require('../common/settings')
const {DefaultSectionTitle} = require('../common/sectionTitle')

Expand Down Expand Up @@ -62,7 +65,7 @@ class PluginsTab extends ImmutableComponent {
? <div>
{this.infoCircle(appConfig.flash.installUrl)}
<span data-l10n-id='enableFlashSubtext' />&nbsp;
<span className='linkText' onClick={aboutActions.createTabRequested.bind(null, {
<span className={css(commonStyles.linkText)} onClick={aboutActions.createTabRequested.bind(null, {
url: appConfig.flash.installUrl
})} title={appConfig.flash.installUrl}>{'Adobe'}</span>.
</div>
Expand All @@ -74,7 +77,7 @@ class PluginsTab extends ImmutableComponent {
<div>
{this.infoCircle(flashInfoLink)}
<span data-l10n-id='flashTroubleshooting' />&nbsp;
<span className='linkText'
<span className={css(commonStyles.linkText)}
onClick={aboutActions.createTabRequested.bind(null, {
url: flashInfoLink,
active: true
Expand Down
Loading

4 comments on commit c270b07

@evq
Copy link
Member

@evq evq commented on c270b07 Jul 31, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yikes not sure where my grep went wrong >.<;

I see one more use of className='linkText' in about:brave, but if I look on my older builds it does not seem that the corresponding link displays orange.

js/about/brave.js
63:          <a className='linkText' href={`https://github.com/brave/browser-laptop/releases/tag/v${this.state.versionInformation.get('Brave')}dev`} target='_blank' data-l10n-id='relNotesInfo2' />

similarly the revision link in about:brave is not orange. I feel like these should be orange for consistency right? (via use of the new aphrodite linkText class style) Should I change them?

also was package-lock.json intentionally included? based on your most recent comment in #8283 I thought it was going to be added to .gitignore temporarily

@luixxiul
Copy link
Contributor

@luixxiul luixxiul commented on c270b07 Jul 31, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@evq I pushed a new commit to the PR after removing package-lock.json, which I mistakenly included to this commit. 5d85d0f

I forgot to search files in js/ for linkText. Would you please fix js/about/brave.js and make sure anything else is not left? thanks!

@evq
Copy link
Member

@evq evq commented on c270b07 Jul 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@luixxiul will do. just to double check though - currently it does not seem that the about:brave links are orange (before any of my changes). they should be orange for consistency though correct?

@luixxiul
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@evq yes, they should :-)

Please sign in to comment.