about summary refs log tree commit diff
path: root/app/views/layouts
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-06-08 15:30:06 +0200
committerGitHub <noreply@github.com>2019-06-08 15:30:06 +0200
commit20dda5cca0a4015a743250b4e584a3101e7675f2 (patch)
tree073f47da50b828cf05a08a46e68ee78006751b9d /app/views/layouts
parentf4bc77f2908a193ef164b4b4fe68b584d71aaa2c (diff)
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
Diffstat (limited to 'app/views/layouts')
-rwxr-xr-xapp/views/layouts/application.html.haml1
-rw-r--r--app/views/layouts/auth.html.haml2
-rw-r--r--app/views/layouts/public.html.haml2
3 files changed, 3 insertions, 2 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 220a4ca9b..747d80bf0 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -36,3 +36,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 aa1990972..585e24655 100644
--- a/app/views/layouts/auth.html.haml
+++ b/app/views/layouts/auth.html.haml
@@ -6,7 +6,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 ee34936d6..2929ac599 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -8,7 +8,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'