From 3d0f9536c403711554621a8eba3d86321fcbd7cc Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Fri, 4 Oct 2013 10:57:54 -0700 Subject: [PATCH] Add layout-based class to body --- app/assets/stylesheets/common.css.scss | 6 +----- app/helpers/application_helper.rb | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 5d65d5994..a62470651 100644 --- 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 f74d5cbf2..23e3b34c5 100644 --- 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 -- 2.39.5