diff options
| author | Reverite <github@reverite.sh> | 2019-06-13 23:05:19 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-06-13 23:05:19 -0700 |
| commit | 7ce2a4e95331cc9ef9b782a5c4d8046d8a835a05 (patch) | |
| tree | bc4e5e39ee96ae74cbf9c09570b2e545da6587e0 /app/views/layouts | |
| parent | 3614718bc91f90a6dc19dd80ecf3bc191283c24e (diff) | |
| parent | c0e5f32d13dfd696728dc1fa2ad9a93a27aa405f (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/views/layouts')
| -rwxr-xr-x | app/views/layouts/application.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/auth.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/mailer.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/public.html.haml | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index f11fddd4d..2be9427c5 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -42,3 +42,4 @@ %div{ style: 'display: none'} = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg') + = render file: Rails.root.join('app', 'javascript', 'images', 'logo_full.svg') diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml index fcbd29fe9..ba105d25e 100644 --- a/app/views/layouts/auth.html.haml +++ b/app/views/layouts/auth.html.haml @@ -3,7 +3,7 @@ .logo-container %h1 = link_to root_path do - = image_pack_tag 'logo_full.svg', alt: 'Mastodon' + = svg_logo_full .form-container = render 'flashes' diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml index 26fb697bb..8b69d758b 100644 --- a/app/views/layouts/mailer.html.haml +++ b/app/views/layouts/mailer.html.haml @@ -46,7 +46,7 @@ %tbody %td.column-cell %p= t 'about.hosted_on', domain: site_hostname - %p= link_to t('application_mailer.notification_preferences'), settings_notifications_url + %p= link_to t('application_mailer.notification_preferences'), settings_preferences_notifications_url %td.column-cell.text-right = link_to root_url do = image_tag full_pack_url('media/images/mailer/logo_transparent.png'), alt: 'Mastodon', height: 24 diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 37808cdd0..92df0bfbe 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -5,7 +5,7 @@ %nav.header .nav-left = link_to root_url, class: 'brand' do - = image_pack_tag 'logo_full.svg', alt: 'Mastodon' + = svg_logo_full = link_to t('directories.directory'), explore_path, class: 'nav-link optional' if Setting.profile_directory = link_to t('about.about_this'), about_more_path, class: 'nav-link optional' |