Merge branch 'main' into glitch-soc/merge-upstream

2022-03-02 18:02:48 +01:00
parent 0b8fe020b5 462a6f7d72
commit 425a6c90c4
189 changed files with 2586 additions and 1444 deletions
--- a/app/views/layouts/modal.html.haml
+++ b/app/views/layouts/modal.html.haml
@ -9,8 +9,9 @@
        = fa_icon 'sign-out'

  .container-alt= yield
+
  .modal-layout__mastodon
    %div
-      %img{alt:'', draggable:'false', src:"#{mascot_url}"}
+      %img{alt: '', draggable: 'false', src: mascot_url }

 = render template: 'layouts/application'