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

Aligned Flash info icons #5783

Merged
merged 1 commit into from
Nov 29, 2016
Merged

Aligned Flash info icons #5783

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
25 changes: 15 additions & 10 deletions js/about/preferences.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1584,24 +1584,29 @@ class SecurityTab extends ImmutableComponent {
<div className='sectionTitle' data-l10n-id='pluginSettings' />
<SettingsList>
<SettingCheckbox checked={this.props.flashInstalled ? this.props.braveryDefaults.get('flash') : false} dataL10nId='enableFlash' onChange={this.onToggleFlash} disabled={!this.props.flashInstalled} />
<span className='subtext'>
<span className='fa fa-info-circle' id='flashInfoIcon' />
<div className='subtext flashText'>
{
isDarwin || isWindows
? <span><span data-l10n-id='enableFlashSubtext' />&nbsp;
? <div>
<span className='fa fa-info-circle' id='flashInfoIcon' />
<span data-l10n-id='enableFlashSubtext' />&nbsp;
<span className='linkText' onClick={aboutActions.newFrame.bind(null, {
location: appConfig.flash.installUrl
}, true)}>{'Adobe'}</span>.</span>
: <span data-l10n-id='enableFlashSubtextLinux' />
}, true)}>{'Adobe'}</span>.
</div>
: <div>
<span className='fa fa-info-circle' id='flashInfoIcon' />
<span data-l10n-id='enableFlashSubtextLinux' />
</div>
}
<div>
<span className='fa fa-info-circle' id='flashInfoIcon' />
<span><span data-l10n-id='flashTroubleshooting' />&nbsp;
<span className='linkText' onClick={aboutActions.newFrame.bind(null, {
location: 'https://github.com/brave/browser-laptop/wiki/Flash-Support-Deprecation-Proposal#troubleshooting-flash-issues'
}, true)}>{'wiki'}</span>.</span>
<span data-l10n-id='flashTroubleshooting' />&nbsp;
<span className='linkText' onClick={aboutActions.newFrame.bind(null, {
location: 'https://github.com/brave/browser-laptop/wiki/Flash-Support-Deprecation-Proposal#troubleshooting-flash-issues'
}, true)}>{'wiki'}</span>.
</div>
</span>
</div>
</SettingsList>
{ !isLinux
? <div>
Expand Down
14 changes: 10 additions & 4 deletions less/about/preferences.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,16 @@ a {
margin: 1.2em 2px 7px;
}

.settingsList .subtext {
&.flashText {
margin-top: 0;

#flashInfoIcon {
padding: 5px 5px 5px 0;
}
}
}

.settingsListCopy {
color: @braveOrange;
cursor: pointer;
Expand Down Expand Up @@ -1002,10 +1012,6 @@ div.nextPaymentSubmission {
}
}

#flashInfoIcon {
padding: 5px 5px 5px 0;
}

.widevineInfoIcon {
padding: 5px;
}
Expand Down