Upstream sync

2020-09-16 05:39:08 +02:00
parent 5cf7be6f13
commit 28e0eb36b7
61 changed files with 419 additions and 268 deletions
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -17,12 +17,12 @@
  </head>

  <body>
+    <div class="flash-message">
+      <%= render "flash" %>
+    </div>
    <%= content_for?(:header) ? yield(:header) : render("header") %>
    <%= render "masquerade" if masquerading? %>
    <main class="container-fluid py-3">
-      <div class="flash-message"></div>
-        <%= render "flash" %>
-      </div>
      <%= content_for?(:content) ? yield(:content) : yield %>
    </main>
  </body>