Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into feature/frontend_refactor

app/views/layouts/application.html.haml

@@ -2,7 +2,7 @@
 %html{ lang: I18n.locale }
   %head
     %meta{ charset: 'utf-8' }/
-    %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }/
+    %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1', 'viewport-fit': 'cover' }/
 
     - if cdn_host?
       %link{ rel: 'dns-prefetch', href: cdn_host }/
@@ -18,6 +18,13 @@
     %meta{ name: 'theme-color', content: '#282c37' }/
     %meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/
 
+    - if @tag
+      = render 'tags/meta', tag: @tag, initial_state_json: @initial_state_json
+    - elsif @stream_entry && @account
+      = render 'stream_entries/meta', stream_entry: @stream_entry, account: @account
+    - elsif @account
+      = render 'accounts/meta', account: @account, older_url: nil, newer_url: nil
+
     %title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title
 
     = stylesheet_pack_tag 'common', media: 'all'

app/views/layouts/public.html.haml

@@ -12,7 +12,8 @@
               = image_pack_tag 'gab_logo.svg', alt: 'Gab Social'
             = link_to t('home'), root_url, class: 'nav-link optional'
             = link_to t('about.about_this'), about_path, class: 'nav-link'
-            = link_to 'Invest', 'https://invest.gab.com', class: 'nav-link'
+            = link_to 'Apps', 'https://apps.gab.com', class: 'nav-link'
+            = link_to 'Trends', 'https://trends.gab.com', class: 'nav-link'
           .nav-center
           .nav-right
             - if user_signed_in?