diff options
| author | shel <Yiskah.Raphen@gmail.com> | 2017-03-31 10:34:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-31 10:34:14 -0400 |
| commit | f20f6b25b98efffca47caae713f8dc5e1d0d4bd1 (patch) | |
| tree | 104152d4bd6f9889f38b2f46fee108185c3b29f7 /app/assets/javascripts/components/features/getting_started | |
| parent | 76188d61f2c3bb5747208df92835e912db18d7b6 (diff) | |
| parent | 680f9efe9c4aa7fce1f4dd6a35ef4aca7a80c1f3 (diff) | |
Merge branch 'master' into patch-2
Diffstat (limited to 'app/assets/javascripts/components/features/getting_started')
| -rw-r--r-- | app/assets/javascripts/components/features/getting_started/index.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/features/getting_started/index.jsx b/app/assets/javascripts/components/features/getting_started/index.jsx index 846e4f53b..6f9e988ba 100644 --- a/app/assets/javascripts/components/features/getting_started/index.jsx +++ b/app/assets/javascripts/components/features/getting_started/index.jsx @@ -41,7 +41,7 @@ const GettingStarted = ({ intl, me }) => { <ColumnLink icon='sign-out' text={intl.formatMessage(messages.sign_out)} href='/auth/sign_out' method='delete' /> </div> - <div className='scrollable optionally-scrollable'> + <div className='scrollable optionally-scrollable' style={{ display: 'flex', flexDirection: 'column' }}> <div className='static-content getting-started'> <p><FormattedMessage id='getting_started.about_addressing' defaultMessage='You can follow people if you know their username and the domain they are on by entering an e-mail-esque address into the form at the top of the sidebar.' /></p> <p><FormattedMessage id='getting_started.about_shortcuts' defaultMessage='If the target user is on the same domain as you, just the username will work. The same rule applies to mentioning people in statuses.' /></p> |