techhub/mastodon
2
0
Fork 0
Code Activity

Stop Mastodon friend from overlapping text 🐘

Browse Source
This commit is contained in:
Jessica Stokes
2017-01-04 17:33:05 -08:00
parent 5b75f6d0f3
commit 312736cd1b
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/components/features/getting_started/index.jsx
View File

@@ -43,13 +43,11 @@ const GettingStarted = ({ intl, me }) => {
{followRequests}
</div>
<div className='static-content'>
<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>
<p><FormattedMessage id='getting_started.about_developer' defaultMessage='The developer of this project can be followed as Gargron@mastodon.social' /></p>
</div>
<div className='getting-started__illustration' />
</Column>
);
};

12
app/assets/stylesheets/components.scss
View File

@@ -608,12 +608,8 @@
}
}
.getting-started__illustration {
width: 330px;
height: 235px;
background: image-url('mastodon-getting-started.png') no-repeat 0 0;
position: absolute;
pointer-events: none;
bottom: 0;
left: 0;
.getting-started {
overflow-y: auto;
padding-bottom: 235px;
background: image-url('mastodon-getting-started.png') no-repeat 0 100% local;
}