treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Add illustration to getting started column

lolsob-rspec
Eugen Rochko 2016-12-27 23:30:11 +01:00
parent 68a18eb852
commit bef225e5da
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/components/features/getting_started/index.jsx
View File

@ -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_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> <p><FormattedMessage id='getting_started.about_developer' defaultMessage='The developer of this project can be followed as Gargron@mastodon.social' /></p>
</div> </div>
<div className='getting-started__illustration' />
</Column> </Column>
); );
}; };

11
app/assets/stylesheets/components.scss
View File

@ -332,6 +332,7 @@
.column { .column {
width: 330px; width: 330px;
position: relative;
} }
.drawer { .drawer {
@ -575,3 +576,13 @@
color: #fff; 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;
}

1
db/schema.rb
View File

@ -189,6 +189,7 @@ ActiveRecord::Schema.define(version: 20161222204147) do
t.boolean "sensitive", default: false t.boolean "sensitive", default: false
t.integer "visibility", default: 0, null: false t.integer "visibility", default: 0, null: false
t.integer "in_reply_to_account_id" 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 ["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 ["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 t.index ["reblog_of_id"], name: "index_statuses_on_reblog_of_id", using: :btree