Download as
Browse Code »

Commit 8573712e9faba39221099591913e7b258768e2a2

Authored by Weblate
2 parents bf5d9be3 c8faf7db
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Merge remote-tracking branch 'origin/master'

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
plugins/container_block/views/blocks/container.html.erb
  Diff comments   View file @8573712
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <div class="clear"></div> 10 <div class="clear"></div>
11 11
12 <style> 12 <style>
13 - <% box_decorator.select_blocks(block.blocks, { :article => @page, :request_path => request.path, :locale => locale }).each do |child| %> 13 + <% box_decorator.select_blocks(block, block.blocks, { :article => @page, :request_path => request.path, :locale => locale, params: request.params, controller: controller}).each do |child| %>
14 #block-<%=block.id%> #block-<%=child.id%> { width: <%= block.child_width(child.id) %>px; } 14 #block-<%=block.id%> #block-<%=child.id%> { width: <%= block.child_width(child.id) %>px; }
15 <% end %> 15 <% end %>
16 </style> 16 </style>