From 98729d50c80760e076607ecf625a95caea817aed Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 5 Jan 2017 03:14:33 +0100
Subject: [PATCH] Make shortcode emojis work, make getting started area
scrollable
---
app/assets/javascripts/components/emoji.jsx | 2 +-
.../components/features/getting_started/index.jsx | 10 ++++++----
app/assets/javascripts/extras.jsx | 2 --
app/assets/stylesheets/components.scss | 6 ++++++
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/app/assets/javascripts/components/emoji.jsx b/app/assets/javascripts/components/emoji.jsx
index a06c759531..c93c07c74b 100644
--- a/app/assets/javascripts/components/emoji.jsx
+++ b/app/assets/javascripts/components/emoji.jsx
@@ -5,5 +5,5 @@ emojione.sprites = false;
emojione.imagePathPNG = '/emoji/';
export default function emojify(text) {
- return emojione.unicodeToImage(text);
+ return emojione.toImage(text);
};
diff --git a/app/assets/javascripts/components/features/getting_started/index.jsx b/app/assets/javascripts/components/features/getting_started/index.jsx
index 77253dd731..51f165f9e2 100644
--- a/app/assets/javascripts/components/features/getting_started/index.jsx
+++ b/app/assets/javascripts/components/features/getting_started/index.jsx
@@ -43,10 +43,12 @@ const GettingStarted = ({ intl, me }) => {
{followRequests}
</div>
- <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 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>
);
diff --git a/app/assets/javascripts/extras.jsx b/app/assets/javascripts/extras.jsx
index b9f8e6842c..c1df182dea 100644
--- a/app/assets/javascripts/extras.jsx
+++ b/app/assets/javascripts/extras.jsx
@@ -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');
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index c644192432..4f03f94e54 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -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%;
}