fixes conflicts with master

2017-05-31 10:36:38 +02:00
parent 02055bd09a 2382dc56b5
commit 1a46b4d4cb
47 changed files with 537 additions and 61 deletions
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -31,7 +31,7 @@
          <%= render 'layouts/admin_header' %>

          <div class="no-margin-top row no-max-width collapse" data-equalizer>
-            <div class="small-12 medium-3 column">
+            <div class="small-12 medium-3 column" data-equalizer-watch>

              <div class="show-for-small-only">
                <button type="button" class="button hollow expanded" data-toggle="offCanvas"><%= t("admin.menu.admin") %></button>