Merge branch 'master' into site-customization

2017-04-07 17:29:33 +02:00
parent 613f5521a2 d988acb18b
commit 9e5324cc1b
279 changed files with 9351 additions and 464 deletions
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -27,7 +27,7 @@

    <h1 class="sr-only"><%= setting['org_name'] %></h1>

-    <div class="wrapper">
+    <div class="wrapper <%= yield (:wrapper_class) %>">
      <%= render 'layouts/header' %>

      <!--[if lt IE 9]>