Selaa lähdekoodia

Remove .p-name microformat class (#7961)

Fix #7926
master
Eugen Rochko 5 vuotta sitten
committed by GitHub
vanhempi
commit
cd509d2146
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 muutettua tiedostoa jossa 2 lisäystä ja 6 poistoa
  1. +1
    -1
      app/views/stream_entries/_detailed_status.html.haml
  2. +1
    -1
      app/views/stream_entries/_simple_status.html.haml
  3. +0
    -4
      spec/views/stream_entries/show.html.haml_spec.rb

+ 1
- 1
app/views/stream_entries/_detailed_status.html.haml Näytä tiedosto

@@ -12,7 +12,7 @@
= render file: Rails.root.join('app', 'javascript', 'images', 'logo.svg')
= t('accounts.follow')

.status__content.p-name.emojify<
.status__content.emojify<
- if status.spoiler_text?
%p{ style: 'margin-bottom: 0' }<
%span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;


+ 1
- 1
app/views/stream_entries/_simple_status.html.haml Näytä tiedosto

@@ -13,7 +13,7 @@
%strong.p-name.emojify= display_name(status.account, custom_emojify: true)
%span= acct(status.account)

.status__content.p-name.emojify<
.status__content.emojify<
- if status.spoiler_text?
%p{ style: 'margin-bottom: 0' }<
%span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;


+ 0
- 4
spec/views/stream_entries/show.html.haml_spec.rb Näytä tiedosto

@@ -30,9 +30,7 @@ describe 'stream_entries/show.html.haml', without_verify_partial_doubles: true d

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.author.name.to_s).to eq alice.display_name
expect(mf2.entry.author.url.to_s).not_to be_empty
end
@@ -56,9 +54,7 @@ describe 'stream_entries/show.html.haml', without_verify_partial_doubles: true d

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.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.url.to_s).not_to be_empty


Ladataan…
Peruuta
Tallenna