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: Show mastodon on modal (#6129)

---
 app/javascript/images/mastodon-drawer.png         | Bin 32449 -> 0 bytes
 app/javascript/images/mastodon-ui.png             | Bin 0 -> 32449 bytes
 app/javascript/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 +
 app/javascript/styles/mastodon/components.scss    |   2 +-
 app/javascript/styles/mastodon/modal.scss         |  20 ++++++++++++++++++++
 7 files changed, 22 insertions(+), 1 deletion(-)
 delete mode 100644 app/javascript/images/mastodon-drawer.png
 create mode 100644 app/javascript/images/mastodon-ui.png
 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

(limited to 'app/javascript')

diff --git a/app/javascript/images/mastodon-drawer.png b/app/javascript/images/mastodon-drawer.png
deleted file mode 100644
index a1fb642a0..000000000
Binary files a/app/javascript/images/mastodon-drawer.png and /dev/null differ
diff --git a/app/javascript/images/mastodon-ui.png b/app/javascript/images/mastodon-ui.png
new file mode 100644
index 000000000..a1fb642a0
Binary files /dev/null and b/app/javascript/images/mastodon-ui.png differ
diff --git a/app/javascript/images/wave-compose-standalone.png b/app/javascript/images/wave-compose-standalone.png
new file mode 100644
index 000000000..287ee639b
Binary files /dev/null and b/app/javascript/images/wave-compose-standalone.png differ
diff --git a/app/javascript/images/wave-modal.png b/app/javascript/images/wave-modal.png
new file mode 100644
index 000000000..88818a6d7
Binary files /dev/null and b/app/javascript/images/wave-modal.png differ
diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss
index 44aa10564..fd6665f65 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 3240b38a4..bc193a15a 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 000000000..310dcb924
--- /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;
+  }
+}
-- 
cgit 


From 764f87695358c06a823a9c9541f2e8fb092de299 Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Tue, 2 Jan 2018 13:28:49 +0900
Subject: Use const instead of let for constant (#6106)

---
 app/javascript/mastodon/features/getting_started/index.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'app/javascript')

diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index 2f02f245f..3c1619c24 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -48,7 +48,7 @@ export default class GettingStarted extends ImmutablePureComponent {
   render () {
     const { intl, myAccount, columns, multiColumn } = this.props;
 
-    let navItems = [];
+    const navItems = [];
 
     if (multiColumn) {
       if (!columns.find(item => item.get('id') === 'HOME')) {
@@ -68,20 +68,20 @@ export default class GettingStarted extends ImmutablePureComponent {
       }
     }
 
-    navItems = navItems.concat([
+    navItems.push(
       <ColumnLink key='4' icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
       <ColumnLink key='5' icon='thumb-tack' text={intl.formatMessage(messages.pins)} to='/pinned' />,
-      <ColumnLink key='6' icon='bars' text={intl.formatMessage(messages.lists)} to='/lists' />,
-    ]);
+      <ColumnLink key='6' icon='bars' text={intl.formatMessage(messages.lists)} to='/lists' />
+    );
 
     if (myAccount.get('locked')) {
       navItems.push(<ColumnLink key='7' icon='users' text={intl.formatMessage(messages.follow_requests)} to='/follow_requests' />);
     }
 
-    navItems = navItems.concat([
+    navItems.push(
       <ColumnLink key='8' icon='volume-off' text={intl.formatMessage(messages.mutes)} to='/mutes' />,
-      <ColumnLink key='9' icon='ban' text={intl.formatMessage(messages.blocks)} to='/blocks' />,
-    ]);
+      <ColumnLink key='9' icon='ban' text={intl.formatMessage(messages.blocks)} to='/blocks' />
+    );
 
     if (multiColumn) {
       navItems.push(<ColumnLink key='10' icon='question' text={intl.formatMessage(messages.keyboard_shortcuts)} to='/keyboard-shortcuts' />);
-- 
cgit