OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Remove .p-name microformat class (#7961) 

Fix #7926
pull/7979/head
Eugen Rochko 2018-07-07 18:51:56 +02:00 committed by GitHub
parent 9804ec3a6d
commit cd509d2146
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/stream_entries/_detailed_status.html.haml
View File

@ -12,7 +12,7 @@
= render file: Rails.root.join('app', 'javascript', 'images', 'logo.svg') = render file: Rails.root.join('app', 'javascript', 'images', 'logo.svg')
= t('accounts.follow') = t('accounts.follow')
.status__content.p-name.emojify< .status__content.emojify<
- if status.spoiler_text? - if status.spoiler_text?
%p{ style: 'margin-bottom: 0' }< %p{ style: 'margin-bottom: 0' }<
%span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp; %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;

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

@ -13,7 +13,7 @@
%strong.p-name.emojify= display_name(status.account, custom_emojify: true) %strong.p-name.emojify= display_name(status.account, custom_emojify: true)
%span= acct(status.account) %span= acct(status.account)
.status__content.p-name.emojify< .status__content.emojify<
- if status.spoiler_text? - if status.spoiler_text?
%p{ style: 'margin-bottom: 0' }< %p{ style: 'margin-bottom: 0' }<
%span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp; %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;

4
spec/views/stream_entries/show.html.haml_spec.rb
View File

@ -30,9 +30,7 @@ describe 'stream_entries/show.html.haml', without_verify_partial_doubles: true d
mf2 = Microformats.parse(rendered) mf2 = Microformats.parse(rendered)
expect(mf2.entry.name.to_s).to eq status.text
expect(mf2.entry.url.to_s).not_to be_empty expect(mf2.entry.url.to_s).not_to be_empty
expect(mf2.entry.author.name.to_s).to eq alice.display_name expect(mf2.entry.author.name.to_s).to eq alice.display_name
expect(mf2.entry.author.url.to_s).not_to be_empty expect(mf2.entry.author.url.to_s).not_to be_empty
end end
@ -56,9 +54,7 @@ describe 'stream_entries/show.html.haml', without_verify_partial_doubles: true d
mf2 = Microformats.parse(rendered) mf2 = Microformats.parse(rendered)
expect(mf2.entry.name.to_s).to eq reply.text
expect(mf2.entry.url.to_s).not_to be_empty expect(mf2.entry.url.to_s).not_to be_empty
expect(mf2.entry.comment.url.to_s).not_to be_empty expect(mf2.entry.comment.url.to_s).not_to be_empty
expect(mf2.entry.comment.author.name.to_s).to eq carl.display_name expect(mf2.entry.comment.author.name.to_s).to eq carl.display_name
expect(mf2.entry.comment.author.url.to_s).not_to be_empty expect(mf2.entry.comment.author.url.to_s).not_to be_empty