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/settings | |
| 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/settings')
| -rw-r--r-- | app/views/settings/profiles/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/settings/two_factor_authentication/confirmations/new.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index 52373a959..ed76885de 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -5,8 +5,8 @@ = render 'shared/error_messages', object: @account .fields-group - = f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name'), hint: t('simple_form.hints.defaults.display_name', counter: "<span class=\"name-counter\">#{30-@account.display_name.size}</span>").html_safe - = f.input :note, placeholder: t('simple_form.labels.defaults.note'), hint: t('simple_form.hints.defaults.note', counter: "<span class=\"note-counter\">#{160-@account.note.size}</span>").html_safe + = f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name'), hint: t('simple_form.hints.defaults.display_name', counter: "<span class=\"name-counter\">#{30 - @account.display_name.size}</span>").html_safe + = f.input :note, placeholder: t('simple_form.labels.defaults.note'), hint: t('simple_form.hints.defaults.note', counter: "<span class=\"note-counter\">#{160 - @account.note.size}</span>").html_safe = f.input :avatar, wrapper: :with_label, hint: t('simple_form.hints.defaults.avatar') = f.input :header, wrapper: :with_label, hint: t('simple_form.hints.defaults.header') diff --git a/app/views/settings/two_factor_authentication/confirmations/new.html.haml b/app/views/settings/two_factor_authentication/confirmations/new.html.haml index 9d950c78e..b7eb0c23d 100644 --- a/app/views/settings/two_factor_authentication/confirmations/new.html.haml +++ b/app/views/settings/two_factor_authentication/confirmations/new.html.haml @@ -5,7 +5,7 @@ %p.hint= t('two_factor_authentication.instructions_html') .qr-wrapper - .qr-code= raw @qrcode.as_svg(padding: 0, module_size: 4) + .qr-code!= @qrcode.as_svg(padding: 0, module_size: 4) .qr-alternative %p.hint= t('two_factor_authentication.manual_instructions') |