Skip to content

Commit

Permalink
Implemented feedback by @bradleyrichter
Browse files Browse the repository at this point in the history
Auditors: @srirambv
  • Loading branch information
bsclifton committed Apr 4, 2017
1 parent eb33307 commit 07a4990
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 21 deletions.
24 changes: 12 additions & 12 deletions app/localShortcuts.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@ module.exports.register = (win) => {
['Alt+Left', messages.SHORTCUT_ACTIVE_FRAME_BACK],
['Alt+Right', messages.SHORTCUT_ACTIVE_FRAME_FORWARD])
} else {
// Different shorcut for View Source as is common for Chrome/Safari on macOS
// See #7702
// Different shorcut for View Source as is common for Chrome/Safari on macOS
// See #7702
simpleWebContentEvents.push(
['Cmd+Alt+U', messages.SHORTCUT_ACTIVE_FRAME_VIEW_SOURCE]
)

if (process.env.NODE_ENV !== 'development') {
// We're in Darwin and release or test mode...
// We disable for development mode because Browser level dev tools copy doesn't work.
// Workaround for #1060
simpleWebContentEvents.push(
['Cmd+Alt+U', messages.SHORTCUT_ACTIVE_FRAME_VIEW_SOURCE]
['Cmd+C', messages.SHORTCUT_ACTIVE_FRAME_COPY]
)

if (process.env.NODE_ENV !== 'development') {
// We're in Darwin and release or test mode...
// We disable for development mode because Browser level dev tools copy doesn't work.
// Workaround for #1060
simpleWebContentEvents.push(
['Cmd+C', messages.SHORTCUT_ACTIVE_FRAME_COPY]
)
}
}
}

// Tab ordering shortcuts
Expand Down
22 changes: 13 additions & 9 deletions js/about/brave.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,25 @@ class AboutBrave extends React.Component {
render () {
return <div className='siteDetailsPage'>
<div className='siteDetailsPageHeader'>
<div data-l10n-id='aboutBrave' className='sectionTitle' />
<div data-l10n-id='aboutBrave' className='sectionTitle' />
<div data-l10n-id='braveInfo' className='title' />
</div>

<div className='siteDetailsPage'>
<div className='siteDetailsPageHeader'>
<div data-l10n-id='releaseNotes' className='sectionTitle' />

<div className='siteDetailsPageContent aboutBrave'>
<div>
<div className='title'>
<span data-l10n-id='relNotesInfo1' />&nbsp;
<a className='linkText' href={`https://github.com/brave/browser-laptop/releases/tag/v${this.state.versionInformation.getIn([0,'version'])}dev`} target='_blank' data-l10n-id='relNotesInfo2' />&nbsp;
<div data-l10n-id='releaseNotes' className='sectionTitle' />
</div>

<div className='title releaseNotes'>
<span data-l10n-id='relNotesInfo1' />
&nbsp;
<a className='linkText' href={`https://github.com/brave/browser-laptop/releases/tag/v${this.state.versionInformation.getIn([0, 'version'])}dev`} target='_blank' data-l10n-id='relNotesInfo2' />
&nbsp;
<span data-l10n-id='relNotesInfo3' />
</div>
</div>
</div>

<div className='siteDetailsPageContent aboutBrave'>
<div className='title'>
<span className='sectionTitle' data-l10n-id='versionInformation' />
<ClipboardButton
Expand All @@ -62,6 +65,7 @@ class AboutBrave extends React.Component {
copyAction={this.onCopy}
/>
</div>

<SortableTable
headings={['Name', 'Version']}
rows={this.state.versionInformation.map((entry) => [
Expand Down
4 changes: 4 additions & 0 deletions less/about/brave.less
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,9 @@
justify-content: space-between;
margin-left: @aboutPageSectionPadding;
}
.title.releaseNotes {
justify-content: inherit;
margin-bottom: 24px;
}
}
}

0 comments on commit 07a4990

Please sign in to comment.