From a8dfe4e490a59458823d64d2ae3c93a4689d5683 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 8 Jun 2019 15:30:06 +0200
Subject: Change full logo to use primary text color of the given theme
 (#10994)

* Change full logo to use primary text color of the given theme

* Fix colors of public layout header in light theme
---
 app/views/about/show.html.haml          | 2 +-
 app/views/layouts/application.html.haml | 1 +
 app/views/layouts/auth.html.haml        | 2 +-
 app/views/layouts/public.html.haml      | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'app/views')

diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index c68b5f597..3185e580e 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -8,7 +8,7 @@
 .landing
   .landing__brand
     = link_to root_url, class: 'brand' do
-      = image_pack_tag 'logo_full.svg', alt: 'Mastodon'
+      = svg_logo_full
       %span.brand__tagline=t 'about.tagline'
 
   .landing__grid
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 8c8ab3d58..496c2eb5a 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -99,3 +99,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/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'
-- 
cgit