diff options
author | Jessica Stokes <hello@jessicastokes.net> | 2017-01-04 17:33:05 -0800 |
---|---|---|
committer | Jessica Stokes <hello@jessicastokes.net> | 2017-01-04 17:33:05 -0800 |
commit | 312736cd1baaea12935e7decbb457c06299cc7d4 (patch) | |
tree | d7385d6fb657a87eb88a6b512294153b5245c328 | |
parent | 5b75f6d0f36940f40db9f1064f37b0069068b691 (diff) |
Stop Mastodon friend from overlapping text 🐘
-rw-r--r-- | app/assets/javascripts/components/features/getting_started/index.jsx | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/components.scss | 12 |
2 files changed, 5 insertions, 11 deletions
diff --git a/app/assets/javascripts/components/features/getting_started/index.jsx b/app/assets/javascripts/components/features/getting_started/index.jsx index 157bdf8f2..77253dd73 100644 --- a/app/assets/javascripts/components/features/getting_started/index.jsx +++ b/app/assets/javascripts/components/features/getting_started/index.jsx @@ -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> ); }; diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss index 2996fa92e..c64419243 100644 --- a/app/assets/stylesheets/components.scss +++ b/app/assets/stylesheets/components.scss @@ -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; } |