Make shortcode emojis work, make getting started area scrollable

2017-01-05 03:14:33 +01:00
parent db21724a5a
commit 98729d50c8
4 changed files with 13 additions and 7 deletions
--- 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%;
 }