From: David Yip <yipdw@member.fsf.org>
Date: Tue, 2 Jan 2018 06:11:41 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/master' into merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=54148b9a4a044e2c3ac9bb5eed71edcc0d598907;p=mastodon.git

Merge remote-tracking branch 'origin/master' into merge-upstream

 Conflicts:
	app/controllers/authorize_follows_controller.rb
	app/javascript/styles/mastodon/components.scss
---

54148b9a4a044e2c3ac9bb5eed71edcc0d598907
diff --cc app/controllers/authorize_follows_controller.rb
index 2d29bd379,7afe664d1..eda50e07d
--- a/app/controllers/authorize_follows_controller.rb
+++ b/app/controllers/authorize_follows_controller.rb
@@@ -4,7 -4,7 +4,8 @@@ class AuthorizeFollowsController < Appl
    layout 'modal'
  
    before_action :authenticate_user!
 +  before_action :set_pack
+   before_action :set_body_classes
  
    def show
      @account = located_account || render(:error)
diff --cc app/controllers/shares_controller.rb
index 81d279c8b,fc2469dea..9c738fc4f
--- a/app/controllers/shares_controller.rb
+++ b/app/controllers/shares_controller.rb
@@@ -25,11 -24,7 +25,11 @@@ class SharesController < ApplicationCon
      }
    end
  
 +  def set_pack
 +    use_pack 'share'
 +  end
 +
    def set_body_classes
-     @body_classes = 'compose-standalone'
+     @body_classes = 'modal-layout compose-standalone'
    end
  end
diff --cc app/javascript/styles/mastodon/components.scss
index 0366d7cba,bc193a15a..a03165690
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@@ -1773,7 -1773,7 +1773,7 @@@
    }
  
    > .mastodon {
-     background: url('~images/mastodon-drawer.png') no-repeat left bottom / contain;
 -    background: url('../images/mastodon-ui.png') no-repeat left bottom / contain;
++    background: url('~images/mastodon-ui.png') no-repeat left bottom / contain;
      flex: 1;
    }
  }