about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-01-02 00:11:41 -0600
committerDavid Yip <yipdw@member.fsf.org>2018-01-02 00:11:41 -0600
commit54148b9a4a044e2c3ac9bb5eed71edcc0d598907 (patch)
tree09cc3cd0558f0152ff17b0c48acbf346b8006098 /app/views
parentfa9b7ece2e521fb4d6b91a95028614ae9b2a58a3 (diff)
parent764f87695358c06a823a9c9541f2e8fb092de299 (diff)
Merge remote-tracking branch 'origin/master' into merge-upstream
 Conflicts:
	app/controllers/authorize_follows_controller.rb
	app/javascript/styles/mastodon/components.scss
Diffstat (limited to 'app/views')
-rw-r--r--app/views/layouts/modal.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/layouts/modal.html.haml b/app/views/layouts/modal.html.haml
index d3519f032..a5d79f5c0 100644
--- a/app/views/layouts/modal.html.haml
+++ b/app/views/layouts/modal.html.haml
@@ -9,5 +9,7 @@
         = fa_icon 'sign-out'
 
   .container= yield
+  .modal-layout__mastodon
+    %div
 
 = render template: 'layouts/application'