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

Commit

Permalink
Fix margin for adblack settings + site exceptions
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bbondy committed Oct 4, 2016
1 parent fc03b69 commit d514e55
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
10 changes: 6 additions & 4 deletions js/about/preferences.js
Original file line number Diff line number Diff line change
Expand Up @@ -1158,11 +1158,13 @@ class ShieldsTab extends ImmutableComponent {
<SettingCheckbox checked={this.props.braveryDefaults.get('safeBrowsing')} dataL10nId='safeBrowsing' onChange={this.onToggleSafeBrowsing} />
<SettingCheckbox checked={this.props.braveryDefaults.get('noScript')} dataL10nId='noScript' 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>
</SettingsList>
<Button l10nId='manageAdblockSettings' className='primaryButton manageAdblockSettings'
onClick={aboutActions.newFrame.bind(null, {
location: 'about:adblock'
}, true)} />
<SitePermissionsPage siteSettings={this.props.siteSettings}
names={braveryPermissionNames}
defaults={this.props.braveryDefaults.merge({
Expand Down
4 changes: 4 additions & 0 deletions less/about/preferences.less
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,10 @@ span.browserButton.primaryButton {
.checkboxContainer {
width: 100px;
}

.manageAdblockSettings {
margin-top: 1em;
}
}

.subtext {
Expand Down

1 comment on commit d514e55

@bsclifton
Copy link
Member

Choose a reason for hiding this comment

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

++

Please sign in to comment.