From 2c1ed5f8720dfdba9cf7582d097f4702e19eeeb6 Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Tue, 2 Jan 2018 13:07:56 +0900
Subject: [PATCH] Show mastodon on modal (#6129)

---
 .../authorize_follows_controller.rb           |   5 +++++
 app/controllers/remote_follow_controller.rb   |   4 ++++
 app/controllers/shares_controller.rb          |   2 +-
 .../{mastodon-drawer.png => mastodon-ui.png}  | Bin
 .../images/wave-compose-standalone.png        | Bin 0 -> 5921 bytes
 app/javascript/images/wave-modal.png          | Bin 0 -> 5200 bytes
 app/javascript/styles/application.scss        |   1 +
 .../styles/mastodon/components.scss           |   2 +-
 app/javascript/styles/mastodon/modal.scss     |  20 ++++++++++++++++++
 app/views/layouts/modal.html.haml             |   2 ++
 10 files changed, 34 insertions(+), 2 deletions(-)
 rename app/javascript/images/{mastodon-drawer.png => mastodon-ui.png} (100%)
 create mode 100644 app/javascript/images/wave-compose-standalone.png
 create mode 100644 app/javascript/images/wave-modal.png
 create mode 100644 app/javascript/styles/mastodon/modal.scss

diff --git a/app/controllers/authorize_follows_controller.rb b/app/controllers/authorize_follows_controller.rb
index 78b5641836..7afe664d1b 100644
--- a/app/controllers/authorize_follows_controller.rb
+++ b/app/controllers/authorize_follows_controller.rb
@@ -4,6 +4,7 @@ class AuthorizeFollowsController < ApplicationController
   layout 'modal'
 
   before_action :authenticate_user!
+  before_action :set_body_classes
 
   def show
     @account = located_account || render(:error)
@@ -58,4 +59,8 @@ class AuthorizeFollowsController < ApplicationController
   def acct_params
     params.fetch(:acct, '')
   end
+
+  def set_body_classes
+    @body_classes = 'modal-layout'
+  end
 end
diff --git a/app/controllers/remote_follow_controller.rb b/app/controllers/remote_follow_controller.rb
index 48b026aa5a..3b988e08d8 100644
--- a/app/controllers/remote_follow_controller.rb
+++ b/app/controllers/remote_follow_controller.rb
@@ -38,4 +38,8 @@ class RemoteFollowController < ApplicationController
   def suspended_account?
     @account.suspended?
   end
+
+  def set_body_classes
+    @body_classes = 'modal-layout'
+  end
 end
diff --git a/app/controllers/shares_controller.rb b/app/controllers/shares_controller.rb
index 994742c3df..fc2469deaa 100644
--- a/app/controllers/shares_controller.rb
+++ b/app/controllers/shares_controller.rb
@@ -25,6 +25,6 @@ class SharesController < ApplicationController
   end
 
   def set_body_classes
-    @body_classes = 'compose-standalone'
+    @body_classes = 'modal-layout compose-standalone'
   end
 end
diff --git a/app/javascript/images/mastodon-drawer.png b/app/javascript/images/mastodon-ui.png
similarity index 100%
rename from app/javascript/images/mastodon-drawer.png
rename to app/javascript/images/mastodon-ui.png
diff --git a/app/javascript/images/wave-compose-standalone.png b/app/javascript/images/wave-compose-standalone.png
new file mode 100644
index 0000000000000000000000000000000000000000..287ee639b3426947ff629f9b8d183d38d0f767cf
GIT binary patch
literal 5921
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

literal 0
HcmV?d00001

diff --git a/app/javascript/images/wave-modal.png b/app/javascript/images/wave-modal.png
new file mode 100644
index 0000000000000000000000000000000000000000..88818a6d78a30e2827d4e86db12f2b0d3d8f24fe
GIT binary patch
literal 5200
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
B>%ag2

literal 0
HcmV?d00001

diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss
index 44aa105645..fd6665f65c 100644
--- a/app/javascript/styles/application.scss
+++ b/app/javascript/styles/application.scss
@@ -6,6 +6,7 @@
 
 @import 'mastodon/reset';
 @import 'mastodon/basics';
+@import 'mastodon/modal';
 @import 'mastodon/containers';
 @import 'mastodon/lists';
 @import 'mastodon/footer';
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 3240b38a42..bc193a15ad 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -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;
     flex: 1;
   }
 }
diff --git a/app/javascript/styles/mastodon/modal.scss b/app/javascript/styles/mastodon/modal.scss
new file mode 100644
index 0000000000..310dcb9249
--- /dev/null
+++ b/app/javascript/styles/mastodon/modal.scss
@@ -0,0 +1,20 @@
+.modal-layout {
+  background: $ui-base-color url('../images/wave-modal.png') repeat-x bottom fixed;
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  padding: 0;
+}
+
+.modal-layout__mastodon {
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  justify-content: flex-end;
+
+  > * {
+    flex: 1;
+    max-height: 235px;
+    background: url('../images/mastodon-ui.png') no-repeat left bottom / contain;
+  }
+}
diff --git a/app/views/layouts/modal.html.haml b/app/views/layouts/modal.html.haml
index a819e098d6..d01b6b6c56 100644
--- a/app/views/layouts/modal.html.haml
+++ b/app/views/layouts/modal.html.haml
@@ -12,5 +12,7 @@
         = fa_icon 'sign-out'
 
   .container= yield
+  .modal-layout__mastodon
+    %div
 
 = render template: 'layouts/application'
-- 
GitLab