From: Eugen <eugen@zeonfederated.com>
Date: Thu, 5 Jan 2017 12:36:55 +0000 (+0100)
Subject: Merge pull request #399 from ticky/public-timeline-de-hoist
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=df89cb5488f4d54c71048c6ee6b2c608a0a8ab50;p=mastodon.git

Merge pull request #399 from ticky/public-timeline-de-hoist

Public timeline de-hoist
---

df89cb5488f4d54c71048c6ee6b2c608a0a8ab50
diff --cc app/assets/javascripts/components/features/getting_started/index.jsx
index ae850c3f9,9f47e7ab4..8f56ba39f
--- a/app/assets/javascripts/components/features/getting_started/index.jsx
+++ b/app/assets/javascripts/components/features/getting_started/index.jsx
@@@ -37,9 -26,8 +26,8 @@@ const GettingStarted = ({ intl, me }) =
    return (
      <Column icon='asterisk' heading={intl.formatMessage(messages.heading)}>
        <div style={{ position: 'relative' }}>
-         <div style={hamburgerStyle}><i className='fa fa-bars' /></div>
          <ColumnLink icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/timelines/public' />
 -        <ColumnLink icon='cog' text={intl.formatMessage(messages.settings)} href='/settings/profile' />
 +        <ColumnLink icon='cog' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' />
          {followRequests}
        </div>