nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix RTL layout of status display names (#9075) 

Fix #2350
This commit is contained in:
Eugen Rochko 2018-10-24 18:18:08 +02:00 committed by GitHub
parent 288e435fe5
commit d723f2a0a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/javascript/styles/mastodon/rtl.scss
View File

@ -130,17 +130,6 @@ body.rtl {
float: left; float: left;
} }
.activity-stream .detailed-status.light .detailed-status__display-name > div {
float: right;
margin-right: 0;
margin-left: 10px;
}
.activity-stream .detailed-status.light .detailed-status__meta span > span {
margin-left: 0;
margin-right: 6px;
}
.status__action-bar { .status__action-bar {
&__counter { &__counter {
@ -174,6 +163,10 @@ body.rtl {
margin-right: 0; margin-right: 0;
} }
.detailed-status__display-name .display-name {
text-align: right;
}
.detailed-status__display-avatar { .detailed-status__display-avatar {
margin-right: 0; margin-right: 0;
margin-left: 10px; margin-left: 10px;

1
app/views/stream_entries/_simple_status.html.haml
View File

@ -15,6 +15,7 @@
%span.display-name %span.display-name
%bdi %bdi
%strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: autoplay) %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: autoplay)
 
%span.display-name__account %span.display-name__account
= acct(status.account) = acct(status.account)
= fa_icon('lock') if status.account.locked? = fa_icon('lock') if status.account.locked?