Add layout-based class to body

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 5d65d5994ab1bc7e71d2ae1dfdbdbe8ce4836fe3..a624706518eabfaa7386d10bbfe5b941f02da643 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -915,11 +915,7 @@ nav.secondary {
 
 /* Rules for the sidebar and main content area */
 
-.site-index,
-.site-export,
-.site-edit,
-.changeset-list,
-.browse {
+.map-layout {
   #content {
     position: absolute;
     top: $headerHeight;

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f74d5cbf294722cf86243874331b0db8aa6fb823..23e3b34c5afb39c852bfca9ead0cf4455e5b9be6 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -94,10 +94,24 @@ module ApplicationHelper
   end
 
   def body_class
-    [params[:controller], "#{params[:controller]}-#{params[:action]}", @extra_body_class].compact.join(" ")
+    [
+        params[:controller],
+        "#{params[:controller]}-#{params[:action]}",
+        "#{current_layout}-layout",
+        @extra_body_class
+    ].compact.join(" ")
   end
 
   def current_page_class(path)
     :current if current_page?(path)
   end
+
+  def current_layout
+    layout = controller.send(:_layout)
+    if layout.instance_of? String
+      layout
+    else
+      File.basename(layout.identifier).split('.').first
+    end
+  end
 end