diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-05-20 03:01:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-20 03:01:44 -0500 |
| commit | 56a3d2b64bb096bc771c1d3c043a9d44d41c3291 (patch) | |
| tree | 6917de2e59e69f5ad0dc9b1471a7c7c8659c1af8 /app/views | |
| parent | 625c4f36ef394215e65e19157bfaf60e7de94b5f (diff) | |
| parent | b481e4fac1c564b8008f6f1d0eea1727ec9faa08 (diff) | |
Merge pull request #494 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/public.html.haml | 2 | ||||
| -rw-r--r-- | app/views/remote_follow/new.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 858d354fa..8bbd184bb 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -9,6 +9,6 @@ - else %span.footer__domain= link_to site_hostname, root_path %span.powered-by - != t('generic.powered_by', link: link_to('Mastodon', 'https://joinmastodon.org')) + != t('generic.powered_by', link: link_to('https://joinmastodon.org') { image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon' }) = render template: 'layouts/application' diff --git a/app/views/remote_follow/new.html.haml b/app/views/remote_follow/new.html.haml index fa48e5e62..fc5c4da20 100644 --- a/app/views/remote_follow/new.html.haml +++ b/app/views/remote_follow/new.html.haml @@ -7,7 +7,7 @@ = simple_form_for @remote_follow, as: :remote_follow, url: account_remote_follow_path(@account) do |f| = render 'shared/error_messages', object: @remote_follow - = f.input :acct, placeholder: t('remote_follow.acct') + = f.input :acct, placeholder: t('remote_follow.acct'), input_html: { autocapitalize: 'none', autocorrect: 'off' } .actions = f.button :button, t('remote_follow.proceed'), type: :submit |