Remove controller_action class from the content div

It's duplicated by the new controller-action class on the body
element, so just use that instead.

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 5cef074e520d302584279fcecf1324b83875b36c..571bc8c3e1831141917d1460dc5ae73a7a0c8200 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -608,9 +608,9 @@ body.site-export #tabnav a#exportanchor,
   bottom: 0px;
 }
 
-#content.site_index,
-#content.site_edit,
-#content.site_export {
+.site-index #content,
+.site-edit #content,
+.site-export #content {
   border: 0px;
   padding: 0px;
 }
@@ -648,7 +648,7 @@ body.site-export #tabnav a#exportanchor,
 
 /* Rules for the home page */
 
-.site_index #map {
+.site-index #map {
   position: absolute;
   top: 0px;
   bottom: 0px;
@@ -656,7 +656,7 @@ body.site-export #tabnav a#exportanchor,
   right: 0px;
 }
 
-.site_export #map {
+.site-export #map {
   position: absolute;
   top: 0px;
   bottom: 0px;
@@ -666,7 +666,7 @@ body.site-export #tabnav a#exportanchor,
 
 /* Rules for the edit page */
 
-.site_edit #map {
+.site-edit #map {
   position: absolute;
   top: 0px;
   bottom: 0px;
@@ -938,14 +938,14 @@ p#contributorGuidance {
 
 /* Rules for the user view */
 
-.user_view .user_map {
+.user-view .user_map {
   position: relative;
   width: 400px;
   height: 400px; 
   border: 1px solid #ccc;
 }
 
-.user_view .user_map p#no_home_location {
+.user-view .user_map p#no_home_location {
   position: absolute;
   top: 0px;
   bottom: 0px;

diff --git a/app/assets/stylesheets/ltr.css.scss b/app/assets/stylesheets/ltr.css.scss
index de8dab75b470f78d3d4c77472c6e3ab2b8ddfa9b..e85813e287ce034ae8832ca329a29b16a6465c47 100644 (file)
--- a/app/assets/stylesheets/ltr.css.scss
+++ b/app/assets/stylesheets/ltr.css.scss
@@ -148,17 +148,17 @@ html body {
 
 /* Rules for the diary list */
 
-.diary_entry_list img.user_image {
+.diary_entry-list img.user_image {
   float: right;
 }
 
 /* Rules for the diary entry view */
 
-.diary_entry_view img.user_image {
+.diary_entry-view img.user_image {
   float: right;
 }
 
-.diary_entry_view img.user_thumbnail {
+.diary_entry-view img.user_thumbnail {
   float: right;
 }
 
@@ -180,11 +180,11 @@ form#termsForm input#agree {
 
 /* Rules for the user view */
 
-.user_view img.user_image {
+.user-view img.user_image {
   float: right;
 }
 
-.user_view .user_map {
+.user-view .user_map {
   float: right;
 }
 

diff --git a/app/assets/stylesheets/rtl.css.scss b/app/assets/stylesheets/rtl.css.scss
index b06271d6fc1c86e206248916c7dacf328d8e0c0a..8b48378ea65041b9eda8a026d791321be403b1bd 100644 (file)
--- a/app/assets/stylesheets/rtl.css.scss
+++ b/app/assets/stylesheets/rtl.css.scss
@@ -148,17 +148,17 @@ html body {
 
 /* Rules for the diary list */
 
-.diary_entry_list img.user_image {
+.diary_entry-list img.user_image {
   float: left;
 }
 
 /* Rules for the diary entry view */
 
-.diary_entry_view img.user_image {
+.diary_entry-view img.user_image {
   float: left;
 }
 
-.diary_entry_view img.user_thumbnail {
+.diary_entry-view img.user_thumbnail {
   float: left;
 }
 
@@ -180,11 +180,11 @@ form#termsForm input#agree {
 
 /* Rules for the user view */
 
-.user_view img.user_image {
+.user-view img.user_image {
   float: left;
 }
 
-.user_view .user_map {
+.user-view .user_map {
   float: left;
 }
 

diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss
index 66cc68655248eca537553a4875b79c53cc6028ac..daacb5a7fa1ea77923d74320e9909607331b52c3 100644 (file)
--- a/app/assets/stylesheets/small.css.scss
+++ b/app/assets/stylesheets/small.css.scss
@@ -107,7 +107,7 @@ h1 {
   border-right: 0px;
 }
 
-#content.site_index {
+.site-index #content {
   left: 0px;
   right: 0px;
   top: 38px;

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index abc26677565d4ac6e30b8cc683941e71b8fe5880..9346b567022016ef28634e522c85d01e6ed1db75 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -6,7 +6,7 @@
       <%= link_to(image_tag("osm_logo.png", :size => "16x16", :border => 0, :alt => t('layouts.logo.alt_text')), root_path) %>
       <h1><%= t 'layouts.project_name.h1' %></h1>
     </div>
-    <div id="content" class="<%= params[:controller] %>_<%= params[:action] %>">
+    <div id="content">
       <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
       <%= yield %>
     </div>