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

Improve UX of default browser check and Manage Adblock Setting button #4951

Merged
merged 1 commit into from
Oct 19, 2016
Merged

Improve UX of default browser check and Manage Adblock Setting button #4951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions js/about/preferences.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,12 +618,11 @@ class GeneralTab extends ImmutableComponent {
const disableShowHomeButton = !homepage || !homepage.length
const defaultLanguage = this.props.languageCodes.find((lang) => lang.includes(navigator.language)) || 'en-US'
const defaultBrowser = getSetting(settings.IS_DEFAULT_BROWSER, this.props.settings)
? <div className='sectionTitle' data-l10n-id='defaultBrowser' />
: <div>
<div className='sectionTitle' data-l10n-id='notDefaultBrowser' />
? <SettingItem dataL10nId='defaultBrowser' />
: <SettingItem dataL10nId='notDefaultBrowser' >
<Button l10nId='setAsDefault' className='primaryButton setAsDefaultButton'
onClick={this.setAsDefaultBrowser} />
</div>
</SettingItem>

return <SettingsList>
<div className='sectionTitle' data-l10n-id='generalSettings' />
Expand Down Expand Up @@ -670,11 +669,11 @@ class GeneralTab extends ImmutableComponent {
<Button l10nId='importNow' className='primaryButton importNowButton'
onClick={this.importBrowserDataNow} />
</SettingItem>
</SettingsList>
<SettingsList>
{defaultBrowser}
<SettingCheckbox dataL10nId='checkDefaultOnStartup' prefKey={settings.CHECK_DEFAULT_ON_STARTUP}
settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
<SettingItem>
<SettingCheckbox dataL10nId='checkDefaultOnStartup' prefKey={settings.CHECK_DEFAULT_ON_STARTUP}
settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
</SettingItem>
</SettingsList>
</SettingsList>
}
Expand Down
6 changes: 6 additions & 0 deletions less/about/preferences.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,8 @@ span.browserButton.primaryButton {

&.clearBrowsingDataButton,
&.importNowButton,
&.setAsDefaultButton,
&.manageAdblockSettings,
&.manageAutofillDataButton {
font-size: 0.9em;
margin-top: 20px;
Expand All @@ -381,6 +383,10 @@ span.browserButton.primaryButton {
&.importNowButton {
margin-top: 5px;
}

&.setAsDefaultButton {
margin-top: 5px;
}
}

.settingsList {
Expand Down