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

Commit d514e55

Browse files
committed
Fix margin for adblack settings + site exceptions
Test Plan: Make sure with site exceptions (like turning off adblock in the bravery panel of a site), that it displays correctly and not glued. For a screenshot see the parent issue. Fix #4503 Auditors: @bsclifton
1 parent fc03b69 commit d514e55

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

js/about/preferences.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -1158,11 +1158,13 @@ class ShieldsTab extends ImmutableComponent {
11581158
<SettingCheckbox checked={this.props.braveryDefaults.get('safeBrowsing')} dataL10nId='safeBrowsing' onChange={this.onToggleSafeBrowsing} />
11591159
<SettingCheckbox checked={this.props.braveryDefaults.get('noScript')} dataL10nId='noScript' onChange={this.onToggleNoScript} />
11601160
<SettingCheckbox dataL10nId='blockCanvasFingerprinting' prefKey={settings.BLOCK_CANVAS_FINGERPRINTING} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
1161+
<SettingItem>
1162+
<Button l10nId='manageAdblockSettings' className='primaryButton manageAdblockSettings'
1163+
onClick={aboutActions.newFrame.bind(null, {
1164+
location: 'about:adblock'
1165+
}, true)} />
1166+
</SettingItem>
11611167
</SettingsList>
1162-
<Button l10nId='manageAdblockSettings' className='primaryButton manageAdblockSettings'
1163-
onClick={aboutActions.newFrame.bind(null, {
1164-
location: 'about:adblock'
1165-
}, true)} />
11661168
<SitePermissionsPage siteSettings={this.props.siteSettings}
11671169
names={braveryPermissionNames}
11681170
defaults={this.props.braveryDefaults.merge({

less/about/preferences.less

+4
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,10 @@ span.browserButton.primaryButton {
445445
.checkboxContainer {
446446
width: 100px;
447447
}
448+
449+
.manageAdblockSettings {
450+
margin-top: 1em;
451+
}
448452
}
449453

450454
.subtext {

0 commit comments

Comments
 (0)