treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Add back button to keyboard shortcuts legend column (#5872)

lolsob-rspec
Lynx Kotoura 2017-12-04 05:29:41 +09:00 committed by Eugen Rochko
parent 8a2424e31a
commit 2d6f2dac11
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/features/keyboard_shortcuts/index.js
View File

@ -1,5 +1,6 @@
import React from 'react'; import React from 'react';
import Column from '../ui/components/column'; import Column from '../ui/components/column';
import ColumnBackButtonSlim from '../../components/column_back_button_slim';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
@ -20,7 +21,8 @@ export default class KeyboardShortcuts extends ImmutablePureComponent {
const { intl } = this.props; const { intl } = this.props;
return ( return (
<Column icon='question' heading={intl.formatMessage(messages.heading)} hideHeadingOnMobile> <Column icon='question' heading={intl.formatMessage(messages.heading)}>
<ColumnBackButtonSlim />
<div className='keyboard-shortcuts scrollable optionally-scrollable'> <div className='keyboard-shortcuts scrollable optionally-scrollable'>
<table> <table>
<thead> <thead>