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

[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..a4d93cc0ec59027adc5a292858538c4f5024b758 100644 (file)
--- a/app/views/layouts/_content.html.erb
+++ b/app/views/layouts/_content.html.erb
@@ -1,4 +1,4 @@
-<div id="content">
+<div id="content" class="<%= content_for :content_class %>">

   <% if content_for? :content %>
     <%= yield :content %>
   <% else %>
   <% if content_for? :content %>
     <%= yield :content %>
   <% else %>