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

Commit

Permalink
buttons should not be included inside settingItem
Browse files Browse the repository at this point in the history
  • Loading branch information
Suguru Hirahara committed Dec 1, 2016
1 parent 834b6b2 commit 733dcf1
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 additions & 12 deletions js/about/preferences.js
Original file line number Diff line number Diff line change
Expand Up @@ -1516,12 +1516,10 @@ class ShieldsTab extends ImmutableComponent {
<SettingCheckbox checked={this.props.braveryDefaults.get('safeBrowsing')} dataL10nId='safeBrowsing' onChange={this.onToggleSafeBrowsing} />
<SettingCheckbox checked={this.props.braveryDefaults.get('noScript')} dataL10nId='noScriptPref' onChange={this.onToggleNoScript} />
<SettingCheckbox dataL10nId='blockCanvasFingerprinting' prefKey={settings.BLOCK_CANVAS_FINGERPRINTING} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
<SettingItem>
<Button l10nId='manageAdblockSettings' className='primaryButton manageAdblockSettings'
onClick={aboutActions.newFrame.bind(null, {
location: 'about:adblock'
}, true)} />
</SettingItem>
<Button l10nId='manageAdblockSettings' className='primaryButton manageAdblockSettings'
onClick={aboutActions.newFrame.bind(null, {
location: 'about:adblock'
}, true)} />
</SettingsList>
<SitePermissionsPage siteSettings={this.props.siteSettings}
names={braveryPermissionNames}
Expand Down Expand Up @@ -1663,12 +1661,10 @@ class AdvancedTab extends ImmutableComponent {
<SettingCheckbox dataL10nId='usePDFJS' prefKey={settings.PDFJS_ENABLED} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
<SettingCheckbox dataL10nId='useTorrentViewer' prefKey={settings.TORRENT_VIEWER_ENABLED} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
<SettingCheckbox dataL10nId='enablePocket' prefKey={settings.POCKET_ENABLED} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
<SettingItem>
<Button l10nId='viewInstalledExtensions' className='primaryButton viewExtensionsInfo'
onClick={aboutActions.newFrame.bind(null, {
location: 'about:extensions'
}, true)} />
</SettingItem>
<Button l10nId='viewInstalledExtensions' className='primaryButton viewExtensionsInfo'
onClick={aboutActions.newFrame.bind(null, {
location: 'about:extensions'
}, true)} />
<div data-l10n-id='moreExtensionsComingSoon' className='moreExtensionsComingSoon' />
</SettingsList>
</div>
Expand Down

0 comments on commit 733dcf1

Please sign in to comment.