Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-09 00:17:17 +00:00
parent 43a9a781a4 ff44b2e92d
commit 447d7e6127
206 changed files with 2401 additions and 737 deletions
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@ -2,6 +2,7 @@
  = site_hostname

 - content_for :header_tags do
+  %link{ rel: 'canonical', href: about_url }/
  %script#initial-state{ type: 'application/json' }!= json_escape(@initial_state_json)
  = render partial: 'shared/og'

@ -102,8 +103,10 @@
      - if Setting.timeline_preview
        .column-4.landing-page__information
          .landing-page__features
-            %h3= t 'about.what_is_mastodon'
-            %p= t 'about.about_mastodon_html'
+            .features-list
+              %div
+                %h3= t 'about.what_is_mastodon'
+                %p= t 'about.about_mastodon_html'

            = render 'features'