From 2d384850cb4b677010e6ba435193f3d8217d1117 Mon Sep 17 00:00:00 2001
From: Jessica Stokes <hello@jessicastokes.net>
Date: Mon, 3 Apr 2017 13:16:14 +1000
Subject: Fix the position of the Mastodon mascot in the UI

The Mastodon mascot was previously anchored to the bottom, and that was since broken. This restores that behaviour!

It also disables the double-scrollbar behaviour that was caused by this area allowing overflow-y in addition to its parent doing so.
---
 app/assets/stylesheets/components.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index f8003e5fd..d233b3471 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -1149,10 +1149,9 @@ a.status__content__spoiler-link {
 
 .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%;
+  flex: 1 0 auto;
 
   p {
     color: $color2;
-- 
cgit 


From 1236a12cae3a002755465ce16deb2455f66c871c Mon Sep 17 00:00:00 2001
From: Marvin Kopf <marvinkopf@posteo.de>
Date: Mon, 3 Apr 2017 09:56:01 +0200
Subject: add mute option in status dropdown

---
 app/assets/javascripts/components/components/status_action_bar.jsx | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'app')

diff --git a/app/assets/javascripts/components/components/status_action_bar.jsx b/app/assets/javascripts/components/components/status_action_bar.jsx
index 234cd396a..4ebb76ea7 100644
--- a/app/assets/javascripts/components/components/status_action_bar.jsx
+++ b/app/assets/javascripts/components/components/status_action_bar.jsx
@@ -7,6 +7,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
   mention: { id: 'status.mention', defaultMessage: 'Mention @{name}' },
+  mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
   block: { id: 'account.block', defaultMessage: 'Block @{name}' },
   reply: { id: 'status.reply', defaultMessage: 'Reply' },
   reblog: { id: 'status.reblog', defaultMessage: 'Reblog' },
@@ -28,6 +29,7 @@ const StatusActionBar = React.createClass({
     onReblog: React.PropTypes.func,
     onDelete: React.PropTypes.func,
     onMention: React.PropTypes.func,
+    onMute: React.PropTypes.func,
     onBlock: React.PropTypes.func,
     onReport: React.PropTypes.func,
     me: React.PropTypes.number.isRequired,
@@ -56,6 +58,10 @@ const StatusActionBar = React.createClass({
     this.props.onMention(this.props.status.get('account'), this.context.router);
   },
 
+  handleMuteClick () {
+    this.props.onMute(this.props.status.get('account'));
+  },
+
   handleBlockClick () {
     this.props.onBlock(this.props.status.get('account'));
   },
@@ -81,6 +87,7 @@ const StatusActionBar = React.createClass({
     } else {
       menu.push({ text: intl.formatMessage(messages.mention, { name: status.getIn(['account', 'username']) }), action: this.handleMentionClick });
       menu.push(null);
+      menu.push({ text: intl.formatMessage(messages.mute, { name: status.getIn(['account', 'username']) }), action: this.handleMuteClick });
       menu.push({ text: intl.formatMessage(messages.block, { name: status.getIn(['account', 'username']) }), action: this.handleBlockClick });
       menu.push({ text: intl.formatMessage(messages.report, { name: status.getIn(['account', 'username']) }), action: this.handleReport });
     }
-- 
cgit