about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-05-19 16:10:55 +0200
committerGitHub <noreply@github.com>2018-05-19 16:10:55 +0200
commit93c66f0c03c27ee02b9875c3c051d9bf50b33e19 (patch)
tree8905c9fde9060730dafc15bb8ab175017b3b48a1
parent587da93152aa68f4ebe3285155aea5642f517d40 (diff)
In footer, replace text "Mastodon" with logo (#7545)
-rw-r--r--app/javascript/styles/mastodon/footer.scss8
-rw-r--r--app/views/layouts/public.html.haml2
2 files changed, 9 insertions, 1 deletions
diff --git a/app/javascript/styles/mastodon/footer.scss b/app/javascript/styles/mastodon/footer.scss
index dd3c1b688..fe2d40c0c 100644
--- a/app/javascript/styles/mastodon/footer.scss
+++ b/app/javascript/styles/mastodon/footer.scss
@@ -26,5 +26,13 @@
         text-decoration: none;
       }
     }
+
+    img {
+      margin: 0 4px;
+      position: relative;
+      bottom: -1px;
+      height: 18px;
+      vertical-align: top;
+    }
   }
 }
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index 63cc3c7a7..600290297 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -12,6 +12,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'