diff --git a/app/assets/javascripts/components/features/getting_started/index.jsx b/app/assets/javascripts/components/features/getting_started/index.jsx
index fdd59462120..157bdf8f2ff 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 }) => {
+
+
);
};
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index 9f2d1217f3f..88808b0850e 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 180d3b14dfc..b9236d42fdc 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