diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-05 03:14:33 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-05 03:14:33 +0100 |
commit | 98729d50c80760e076607ecf625a95caea817aed (patch) | |
tree | 80ff59a6ef4c9ef1b6865a70138ed1b11163aa24 /app/assets/stylesheets/components.scss | |
parent | db21724a5a74d08f895753bf755cbf558148d9b5 (diff) |
Make shortcode emojis work, make getting started area scrollable
Diffstat (limited to 'app/assets/stylesheets/components.scss')
-rw-r--r-- | app/assets/stylesheets/components.scss | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss index c64419243..4f03f94e5 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%; } |