From e2c2fefc36cfa906034152289fe4c916e9a8d46b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 27 Dec 2016 23:30:11 +0100
Subject: [PATCH] Add illustration to getting started column
---
.../components/features/getting_started/index.jsx | 2 ++
app/assets/stylesheets/components.scss | 11 +++++++++++
db/schema.rb | 1 +
3 files changed, 14 insertions(+)
diff --git a/app/assets/javascripts/components/features/getting_started/index.jsx b/app/assets/javascripts/components/features/getting_started/index.jsx
index fdd5946212..157bdf8f2f 100644
--- a/app/assets/javascripts/components/features/getting_started/index.jsx
+++ b/app/assets/javascripts/components/features/getting_started/index.jsx
@@ -48,6 +48,8 @@ const GettingStarted = ({ intl, me }) => {
<p><FormattedMessage id='getting_started.about_shortcuts' defaultMessage='If the target user is on the same domain as you, just the username will work. The same rule applies to mentioning people in statuses.' /></p>
<p><FormattedMessage id='getting_started.about_developer' defaultMessage='The developer of this project can be followed as Gargron@mastodon.social' /></p>
</div>
+
+ <div className='getting-started__illustration' />
</Column>
);
};
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index 9f2d1217f3..88808b0850 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -332,6 +332,7 @@
.column {
width: 330px;
+ position: relative;
}
.drawer {
@@ -575,3 +576,13 @@
color: #fff;
}
}
+
+.getting-started__illustration {
+ width: 330px;
+ height: 235px;
+ background: image-url('mastodon-getting-started.png') no-repeat 0 0;
+ position: absolute;
+ pointer-events: none;
+ bottom: 0;
+ left: 0;
+}
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index 180d3b14df..b9236d42fd 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -189,6 +189,7 @@ ActiveRecord::Schema.define(version: 20161222204147) do
t.boolean "sensitive", default: false
t.integer "visibility", default: 0, null: false
t.integer "in_reply_to_account_id"
+ t.string "conversation_uri"
t.index ["account_id"], name: "index_statuses_on_account_id", using: :btree
t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id", using: :btree
t.index ["reblog_of_id"], name: "index_statuses_on_reblog_of_id", using: :btree
--
GitLab