Merge branch 'master' into add_cards_to_custom_pages

2019-01-28 14:49:39 +01:00
parent 486100bf53 4c511c534a
commit bd4826b25e
57 changed files with 1010 additions and 196 deletions
--- a/app/views/admin/site_customization/images/index.html.erb
+++ b/app/views/admin/site_customization/images/index.html.erb
@@ -9,7 +9,7 @@
  </thead>
  <tbody>
    <% @images.each do |image| %>
-      <tr class="<%= image.name %>">
+      <tr id="image_<%= image.name %>">
        <td class="small-12 medium-4">
          <strong><%= image.name %></strong> (<%= image.required_width %>x<%= image.required_height %>)
        </td>