Merge remote-tracking branch 'upstream/pull/4303'

[rails.git] / app / views / layouts / _content.html.erb

diff --git a/app/views/layouts/_content.html.erb b/app/views/layouts/_content.html.erb
index 632a5c83961ab937feed1bfbad0feb3680bd94c6..cfb8d712cc7ebef8873640b03c6f1ebb151a467a 100644 (file)
--- a/app/views/layouts/_content.html.erb
+++ b/app/views/layouts/_content.html.erb
@@ -1,11 +1,11 @@
-<div id="content">
+<div id="content" class="<%= content_for :content_class %>">

   <% if content_for? :content %>
     <%= yield :content %>
   <% else %>
     <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
     <% if content_for? :heading %>
       <div class="content-heading">
   <% if content_for? :content %>
     <%= yield :content %>
   <% else %>
     <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
     <% if content_for? :heading %>
       <div class="content-heading">

-        <div class="content-inner">
+        <div class="content-inner <%= yield :heading_class %>">

           <%= yield :heading %>
         </div>
       </div>
           <%= yield :heading %>
         </div>
       </div>