Merge branch 'main' into glitch-soc/merge-upstream

2022-10-28 11:36:25 +02:00
parent 371563b0e2 8dfe5179ee
commit cb19be67d1
567 changed files with 14361 additions and 20828 deletions
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -21,15 +21,16 @@

    .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'