Make shortcode emojis work, make getting started area scrollable
This commit is contained in:
		@@ -5,5 +5,5 @@ emojione.sprites      = false;
 | 
			
		||||
emojione.imagePathPNG = '/emoji/';
 | 
			
		||||
 | 
			
		||||
export default function emojify(text) {
 | 
			
		||||
  return emojione.unicodeToImage(text);
 | 
			
		||||
  return emojione.toImage(text);
 | 
			
		||||
};
 | 
			
		||||
 
 | 
			
		||||
@@ -43,11 +43,13 @@ const GettingStarted = ({ intl, me }) => {
 | 
			
		||||
        {followRequests}
 | 
			
		||||
      </div>
 | 
			
		||||
 | 
			
		||||
      <div className='scrollable optionally-scrollable'>
 | 
			
		||||
        <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>
 | 
			
		||||
    </Column>
 | 
			
		||||
  );
 | 
			
		||||
};
 | 
			
		||||
 
 | 
			
		||||
@@ -19,8 +19,6 @@ $(() => {
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  $('.webapp-btn').on('click', e => {
 | 
			
		||||
    console.log(e);
 | 
			
		||||
 | 
			
		||||
    if (e.button === 0) {
 | 
			
		||||
      e.preventDefault();
 | 
			
		||||
      window.location.href = $(e.target).attr('href');
 | 
			
		||||
 
 | 
			
		||||
@@ -436,6 +436,10 @@
 | 
			
		||||
  overflow-x: hidden;
 | 
			
		||||
  flex: 1 1 auto;
 | 
			
		||||
  -webkit-overflow-scrolling: touch;
 | 
			
		||||
 | 
			
		||||
  &.optionally-scrollable {
 | 
			
		||||
    overflow-y: auto;
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.column-back-button {
 | 
			
		||||
@@ -609,7 +613,9 @@
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.getting-started {
 | 
			
		||||
  box-sizing: border-box;
 | 
			
		||||
  overflow-y: auto;
 | 
			
		||||
  padding-bottom: 235px;
 | 
			
		||||
  background: image-url('mastodon-getting-started.png') no-repeat 0 100% local;
 | 
			
		||||
  height: 100%;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user