diff --git a/app/assets/images/onboard-compose.JPG b/app/assets/images/onboard-compose.JPG
new file mode 100644
index 00000000..c1084699
Binary files /dev/null and b/app/assets/images/onboard-compose.JPG differ
diff --git a/app/assets/images/onboard-federated-timeline.jpg b/app/assets/images/onboard-federated-timeline.jpg
new file mode 100644
index 00000000..42629a4e
Binary files /dev/null and b/app/assets/images/onboard-federated-timeline.jpg differ
diff --git a/app/assets/images/onboard-getting-started.jpg b/app/assets/images/onboard-getting-started.jpg
new file mode 100644
index 00000000..51080aed
Binary files /dev/null and b/app/assets/images/onboard-getting-started.jpg differ
diff --git a/app/assets/images/onboard-home.jpg b/app/assets/images/onboard-home.jpg
new file mode 100644
index 00000000..71847792
Binary files /dev/null and b/app/assets/images/onboard-home.jpg differ
diff --git a/app/assets/images/onboard-local-timeline.jpg b/app/assets/images/onboard-local-timeline.jpg
new file mode 100644
index 00000000..058d5043
Binary files /dev/null and b/app/assets/images/onboard-local-timeline.jpg differ
diff --git a/app/assets/images/onboard-notifications.jpg b/app/assets/images/onboard-notifications.jpg
new file mode 100644
index 00000000..71d5af91
Binary files /dev/null and b/app/assets/images/onboard-notifications.jpg differ
diff --git a/app/assets/images/onboard-search.JPG b/app/assets/images/onboard-search.JPG
new file mode 100644
index 00000000..14f17fbc
Binary files /dev/null and b/app/assets/images/onboard-search.JPG differ
diff --git a/app/assets/images/onboard-sliders.JPG b/app/assets/images/onboard-sliders.JPG
new file mode 100644
index 00000000..d63ecfdd
Binary files /dev/null and b/app/assets/images/onboard-sliders.JPG differ
diff --git a/app/assets/javascripts/components/features/ui/components/onboarding_modal.jsx b/app/assets/javascripts/components/features/ui/components/onboarding_modal.jsx
index 5afca860..f27ac7ef 100644
--- a/app/assets/javascripts/components/features/ui/components/onboarding_modal.jsx
+++ b/app/assets/javascripts/components/features/ui/components/onboarding_modal.jsx
@@ -12,19 +12,59 @@ const PageOne = ({ acct, domain }) => (
);
-const PageTwo = ({ admin }) => (
+const PageTwo = (
-
- @{admin.get('acct')} }} />
-
- }}/>
-
-
GitHub }} />
-
}} />
-
+
+
);
+
+const PageThree = (
+
+
+
+
+
+);
+
+const PageFour = (
+
+);
+
+const PageFive = (
+
+);
+
+const PageSix = ({ admin }) => (
+
+
+ @{admin.get('acct')} }} />
+
+ }}/>
+
+
GitHub }} />
+
}} />
+
+
+);
+
+
+
const mapStateToProps = state => ({
me: state.getIn(['accounts', state.getIn(['meta', 'me'])]),
admin: state.getIn(['accounts', state.getIn(['meta', 'admin'])]),
@@ -74,7 +114,11 @@ const OnboardingModal = React.createClass({
const pages = [
,
-
+ PageTwo,
+ PageThree,
+ PageFour,
+ PageFive,
+
];
const { currentIndex } = this.state;
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index 431959b1..567d8fee 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -1995,9 +1995,11 @@ button.active i.fa-retweet {
}
p {
- font-size: 16px;
+ font-size: 18px;
color: lighten($color1, 8%);
+ margin-top: 10px;
margin-bottom: 10px;
+ line-height: 10x;
&:last-child {
margin-bottom: 0;
@@ -2008,3 +2010,21 @@ button.active i.fa-retweet {
}
}
}
+
+ .onboarding-modal__image {
+ border-radius: 8px;
+ width: 70vw;
+ max-width: 450px;
+ max-height: auto;
+ display: block;
+ margin: auto;
+ }
+
+.onboard-sliders {
+ display: inline-block;
+ max-width: 30px;
+ max-height: auto;
+ margin-left: 10px;
+ }
+
+
diff --git a/public/onboarding/onboard-compose.jpg b/public/onboarding/onboard-compose.jpg
new file mode 100644
index 00000000..c1084699
Binary files /dev/null and b/public/onboarding/onboard-compose.jpg differ
diff --git a/public/onboarding/onboard-federated-timeline.jpg b/public/onboarding/onboard-federated-timeline.jpg
new file mode 100644
index 00000000..42629a4e
Binary files /dev/null and b/public/onboarding/onboard-federated-timeline.jpg differ
diff --git a/public/onboarding/onboard-getting-started.jpg b/public/onboarding/onboard-getting-started.jpg
new file mode 100644
index 00000000..51080aed
Binary files /dev/null and b/public/onboarding/onboard-getting-started.jpg differ
diff --git a/public/onboarding/onboard-home.jpg b/public/onboarding/onboard-home.jpg
new file mode 100644
index 00000000..71847792
Binary files /dev/null and b/public/onboarding/onboard-home.jpg differ
diff --git a/public/onboarding/onboard-local-timeline.jpg b/public/onboarding/onboard-local-timeline.jpg
new file mode 100644
index 00000000..058d5043
Binary files /dev/null and b/public/onboarding/onboard-local-timeline.jpg differ
diff --git a/public/onboarding/onboard-notifications.jpg b/public/onboarding/onboard-notifications.jpg
new file mode 100644
index 00000000..71d5af91
Binary files /dev/null and b/public/onboarding/onboard-notifications.jpg differ
diff --git a/public/onboarding/onboard-search.jpg b/public/onboarding/onboard-search.jpg
new file mode 100644
index 00000000..14f17fbc
Binary files /dev/null and b/public/onboarding/onboard-search.jpg differ
diff --git a/public/onboarding/onboard-sliders.jpg b/public/onboarding/onboard-sliders.jpg
new file mode 100644
index 00000000..d63ecfdd
Binary files /dev/null and b/public/onboarding/onboard-sliders.jpg differ
diff --git a/public/onboarding/onboard-sliders.png b/public/onboarding/onboard-sliders.png
new file mode 100644
index 00000000..9fbe2907
Binary files /dev/null and b/public/onboarding/onboard-sliders.png differ