diff options
author | yhirano <yhirano@me.com> | 2017-05-08 10:35:25 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-08 03:35:25 +0200 |
commit | 48594b18e6285d87ee2f58daa08d356b571c8aa6 (patch) | |
tree | 58401bb04d522822b1463dd754a9555f1de3d755 /app/views/about | |
parent | b18504adfefe521ab1486e1fa04662e9084fbe32 (diff) |
Added haml-lint and fix warnings (#2773)
* add haml_lint to Gemfile * add .haml-lint.yml * fix warnings of haml_lint
Diffstat (limited to 'app/views/about')
-rw-r--r-- | app/views/about/_contact.html.haml | 2 | ||||
-rw-r--r-- | app/views/about/_registration.html.haml | 4 | ||||
-rw-r--r-- | app/views/about/more.html.haml | 4 | ||||
-rw-r--r-- | app/views/about/show.html.haml | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/app/views/about/_contact.html.haml b/app/views/about/_contact.html.haml index d8c54c182..39e4e98ec 100644 --- a/app/views/about/_contact.html.haml +++ b/app/views/about/_contact.html.haml @@ -7,7 +7,7 @@ .name = link_to TagManager.instance.url_for(contact.contact_account) do %span.display_name.emojify= display_name(contact.contact_account) - %span.username= "@#{contact.contact_account.acct}" + %span.username @#{contact.contact_account.acct} - if contact.site_contact_email .contact-email diff --git a/app/views/about/_registration.html.haml b/app/views/about/_registration.html.haml index c7a9a488b..4f38c1ecc 100644 --- a/app/views/about/_registration.html.haml +++ b/app/views/about/_registration.html.haml @@ -11,12 +11,12 @@ required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.email') } = f.input :password, - autocomplete: "off", + autocomplete: 'off', placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password') } = f.input :password_confirmation, - autocomplete: "off", + autocomplete: 'off', placeholder: t('simple_form.labels.defaults.confirm_password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_password') } diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml index 55580f996..cce749561 100644 --- a/app/views/about/more.html.haml +++ b/app/views/about/more.html.haml @@ -8,7 +8,7 @@ %h2= site_hostname - unless @instance_presenter.site_description.blank? - %p= @instance_presenter.site_description.html_safe + %p!= @instance_presenter.site_description .information-board .section @@ -25,7 +25,7 @@ %span= t 'about.domain_count_after' - unless @instance_presenter.site_extended_description.blank? - .panel= @instance_presenter.site_extended_description.html_safe + .panel!= @instance_presenter.site_extended_description .sidebar = render 'contact', contact: @instance_presenter diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml index 7bdfb1d2a..fd21c2a7f 100644 --- a/app/views/about/show.html.haml +++ b/app/views/about/show.html.haml @@ -20,7 +20,7 @@ = image_tag asset_pack_path('logo.png') = Setting.site_title - %p= t('about.about_mastodon').html_safe + %p!= t('about.about_mastodon') .screenshot-with-signup .mascot= image_tag asset_pack_path('fluffy-elephant-friend.png') @@ -32,7 +32,7 @@ - if @instance_presenter.closed_registrations_message.blank? %p= t('about.closed_registrations') - else - = @instance_presenter.closed_registrations_message.html_safe + != @instance_presenter.closed_registrations_message .info = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn' · @@ -74,7 +74,7 @@ - unless @instance_presenter.site_description.blank? %h3= t('about.description_headline', domain: site_hostname) - %p= @instance_presenter.site_description.html_safe + %p!= @instance_presenter.site_description .actions .info |