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

app/views/about/_forms.html.haml

@@ -1,12 +1,13 @@
 - if @instance_presenter.open_registrations
   = render 'registration'
 - else
-  - if @instance_presenter.closed_registrations_message.blank?
-    %p= t('about.closed_registrations')
-  - else
-    = @instance_presenter.closed_registrations_message.html_safe
+  = link_to t('auth.register_elsewhere'), 'https://joinmastodon.org', class: 'button button-primary'
 
-  = link_to t('auth.register'), 'https://joinmastodon.org', class: 'button button-primary'
+  .closed-registrations-message
+    - if @instance_presenter.closed_registrations_message.blank?
+      %p= t('about.closed_registrations')
+    - else
+      = @instance_presenter.closed_registrations_message.html_safe
 
 .separator-or
   %span= t('auth.or')

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'