Merge pull request #1876 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

1 files changed, 8 insertions, 6 deletions

diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index aa66815cc..3048e0e6a 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -14,22 +14,24 @@
               = link_to root_path do
                 = logo_as_symbol(:wordmark)
 
-            = link_to '#', class: 'sidebar__toggle__icon' do
+            = link_to '#', class: 'sidebar__toggle__icon', 'aria-label': t('navigation.toggle_menu'), 'aria-expanded': 'false' do
               = fa_icon 'bars'
+              = fa_icon 'times'
 
           = render_navigation
 
     .content-wrapper
       .content
-        .content-heading
+        .content__heading
           - if content_for?(:heading)
             = yield :heading
           - else
-            %h2= yield :page_title
+            .content__heading__row
+              %h2= yield :page_title
 
-          - if :heading_actions
-            .content-heading-actions
-              = yield :heading_actions
+              - if content_for?(:heading_actions)
+                .content__heading__actions
+                  = yield :heading_actions
 
         = render 'application/flashes'