Merge commit 'd20d04922672ed016029c40ed64798f341ebca91' into glitch-soc/merge-upstream

app/views/admin/settings/branding/show.html.haml

@@ -75,10 +75,11 @@
 
   .fields-row
     = f.input :landing_page,
+              as: :radio_buttons,
               collection: f.object.class::LANDING_PAGE,
               include_blank: false,
-              label_method: ->(page) { I18n.t("admin.settings.landing_page.values.#{page}") },
-              wrapper: :with_label
+              label_method: ->(page) { safe_join([I18n.t("admin.settings.landing_page.values.#{page}"), content_tag(:span, I18n.t("admin.settings.landing_page.hints.#{page}_html"), class: 'hint')]) },
+              wrapper: :with_block_label
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit

app/views/layouts/admin.html.haml

@@ -8,7 +8,7 @@
 - content_for :content do
   %a.navigation-skip-link{ href: '#content' }= t('admin.skip_to_content')
   .admin-wrapper
-    %nav.sidebar-wrapper
+    %header.sidebar-wrapper
       .sidebar-wrapper__inner
         .sidebar
           = link_to root_path do
@@ -23,7 +23,8 @@
               = material_symbol 'menu'
               = material_symbol 'close'
 
-          = render_navigation
+          %nav
+            = render_navigation
 
     %main.content-wrapper#content
       .content