Skip to content

Commit

Permalink
Stop Mastodon friend from overlapping text 🐘
Browse files Browse the repository at this point in the history
  • Loading branch information
ticky committed Jan 5, 2017
1 parent 5b75f6d commit 312736c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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>
);
};
Expand Down
12 changes: 4 additions & 8 deletions app/assets/stylesheets/components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

0 comments on commit 312736c

Please sign in to comment.