Merge tag 'v1.0.5+3.2.0' into hometown-v1.0.5+3.3.0

app/views/layouts/admin.html.haml

@@ -7,13 +7,16 @@
     .sidebar-wrapper
       .sidebar-wrapper__inner
         .sidebar
-          = link_to root_path do
-            = image_pack_tag 'logo.svg', class: 'logo', alt: 'Mastodon'
+          .logo
+            %h2
+              = link_to root_url, class: 'brand' do
+                = site_title
 
           .sidebar__toggle
             .sidebar__toggle__logo
-              = link_to root_path do
-                = svg_logo_full
+              %h2
+                = link_to root_path, class: 'brand' do
+                  = site_title
 
             = link_to '#', class: 'sidebar__toggle__icon' do
               = fa_icon 'bars'

app/views/layouts/application.html.haml

@@ -39,5 +39,4 @@
     = content_for?(:content) ? yield(:content) : yield
 
     .logo-resources
-      = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')
-      = render file: Rails.root.join('app', 'javascript', 'images', 'logo_full.svg')
+      = render file: Rails.root.join('app', 'javascript', 'images', 'hometown.svg')

app/views/layouts/auth.html.haml

@@ -5,8 +5,8 @@
   .container-alt
     .logo-container
       %h1
-        = link_to root_path do
-          = svg_logo_full
+        = link_to root_path, class: 'brand' do
+          = site_title
 
     .form-container
       = render 'flashes'

app/views/layouts/error.html.haml

@@ -12,6 +12,8 @@
   %body.error
     .dialog
       .dialog__illustration
-        %img{ alt: Setting.default_settings['site_title'], src: '/oops.png' }/
+        %h1
+          = link_to root_url, class: 'brand' do
+            = Setting.default_settings['site_title']
       .dialog__message
         %h1= yield :content

app/views/layouts/mailer.html.haml

@@ -24,7 +24,8 @@
                               %tr
                                 %td.column-cell
                                   = link_to root_url do
-                                    = image_tag full_pack_url('media/images/mailer/logo_full.png'), alt: 'Mastodon', height: 34, class: 'logo'
+                                    %h1
+                                      = site_title
 
     = yield
 
@@ -49,4 +50,5 @@
                                 %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
+                                  %h4
+                                    = site_title

app/views/layouts/public.html.haml

@@ -9,7 +9,7 @@
         %nav.header
           .nav-left
             = link_to root_url, class: 'brand' do
-              = svg_logo_full
+              = site_title
 
             - unless whitelist_mode?
               = link_to t('directories.directory'), explore_path, class: 'nav-link optional' if Setting.profile_directory