fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-10 09:29:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add "sign in to participate" message to public toot page (#8200)

Browse source
This commit is contained in:
Eugen Rochko 2018-08-18 12:48:27 +02:00 committed by GitHub
parent 5059989cc7
commit 85bb32c410
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/javascript/styles/mastodon/stream_entries.scss
View file

@ -37,7 +37,8 @@
&:last-child { &:last-child {
.detailed-status, .detailed-status,
.status { .status,
.load-more {
border-bottom: 0; border-bottom: 0;
border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;
} }
@ -45,13 +46,15 @@
&:first-child { &:first-child {
.detailed-status, .detailed-status,
.status { .status,
.load-more {
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
} }
&:last-child { &:last-child {
.detailed-status, .detailed-status,
.status { .status,
.load-more {
border-radius: 4px; border-radius: 4px;
} }
} }
@ -59,7 +62,8 @@
@media screen and (max-width: 740px) { @media screen and (max-width: 740px) {
.detailed-status, .detailed-status,
.status { .status,
.load-more {
border-radius: 0 !important; border-radius: 0 !important;
} }
} }

6
app/views/stream_entries/_status.html.haml
View file

@ -53,3 +53,9 @@
- if @next_descendant_thread - if @next_descendant_thread
.entry{ class: entry_classes } .entry{ class: entry_classes }
= link_to_more short_account_status_url(status.account.username, status, since_descendant_thread_id: @max_descendant_thread_id - 1) = link_to_more short_account_status_url(status.account.username, status, since_descendant_thread_id: @max_descendant_thread_id - 1)
- if include_threads && !embedded_view? && !user_signed_in?
.entry{ class: entry_classes }
= link_to new_user_session_path, class: 'load-more load-gap' do
= fa_icon 'comments'
= t('statuses.sign_in_to_participate')

1
config/locales/en.yml
View file

@ -746,6 +746,7 @@ en:
private: Non-public toot cannot be pinned private: Non-public toot cannot be pinned
reblog: A boost cannot be pinned reblog: A boost cannot be pinned
show_more: Show more show_more: Show more
sign_in_to_participate: Sign in to participate in the conversation
title: '%{name}: "%{quote}"' title: '%{name}: "%{quote}"'
visibilities: visibilities:
private: Followers-only private: Followers-only