cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove controller_action class from the content div

Browse source 
It's duplicated by the new controller-action class on the body
element, so just use that instead.
This commit is contained in:
Tom Hughes 2012-09-06 22:01:49 +01:00
parent 800dbbf41b
commit ec4ef1ad2b
5 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/assets/stylesheets/common.css.scss
View file

@ -608,9 +608,9 @@ body.site-export #tabnav a#exportanchor,
bottom: 0px; bottom: 0px;
} }
#content.site_index, .site-index #content,
#content.site_edit, .site-edit #content,
#content.site_export { .site-export #content {
border: 0px; border: 0px;
padding: 0px; padding: 0px;
} }
@ -648,7 +648,7 @@ body.site-export #tabnav a#exportanchor,
/* Rules for the home page */ /* Rules for the home page */
.site_index #map { .site-index #map {
position: absolute; position: absolute;
top: 0px; top: 0px;
bottom: 0px; bottom: 0px;
@ -656,7 +656,7 @@ body.site-export #tabnav a#exportanchor,
right: 0px; right: 0px;
} }
.site_export #map { .site-export #map {
position: absolute; position: absolute;
top: 0px; top: 0px;
bottom: 0px; bottom: 0px;
@ -666,7 +666,7 @@ body.site-export #tabnav a#exportanchor,
/* Rules for the edit page */ /* Rules for the edit page */
.site_edit #map { .site-edit #map {
position: absolute; position: absolute;
top: 0px; top: 0px;
bottom: 0px; bottom: 0px;
@ -938,14 +938,14 @@ p#contributorGuidance {
/* Rules for the user view */ /* Rules for the user view */
.user_view .user_map { .user-view .user_map {
position: relative; position: relative;
width: 400px; width: 400px;
height: 400px; height: 400px;
border: 1px solid #ccc; border: 1px solid #ccc;
} }
.user_view .user_map p#no_home_location { .user-view .user_map p#no_home_location {
position: absolute; position: absolute;
top: 0px; top: 0px;
bottom: 0px; bottom: 0px;

10
app/assets/stylesheets/ltr.css.scss
View file

@ -148,17 +148,17 @@ html body {
/* Rules for the diary list */ /* Rules for the diary list */
.diary_entry_list img.user_image { .diary_entry-list img.user_image {
float: right; float: right;
} }
/* Rules for the diary entry view */ /* Rules for the diary entry view */
.diary_entry_view img.user_image { .diary_entry-view img.user_image {
float: right; float: right;
} }
.diary_entry_view img.user_thumbnail { .diary_entry-view img.user_thumbnail {
float: right; float: right;
} }
@ -180,11 +180,11 @@ form#termsForm input#agree {
/* Rules for the user view */ /* Rules for the user view */
.user_view img.user_image { .user-view img.user_image {
float: right; float: right;
} }
.user_view .user_map { .user-view .user_map {
float: right; float: right;
} }

10
app/assets/stylesheets/rtl.css.scss
View file

@ -148,17 +148,17 @@ html body {
/* Rules for the diary list */ /* Rules for the diary list */
.diary_entry_list img.user_image { .diary_entry-list img.user_image {
float: left; float: left;
} }
/* Rules for the diary entry view */ /* Rules for the diary entry view */
.diary_entry_view img.user_image { .diary_entry-view img.user_image {
float: left; float: left;
} }
.diary_entry_view img.user_thumbnail { .diary_entry-view img.user_thumbnail {
float: left; float: left;
} }
@ -180,11 +180,11 @@ form#termsForm input#agree {
/* Rules for the user view */ /* Rules for the user view */
.user_view img.user_image { .user-view img.user_image {
float: left; float: left;
} }
.user_view .user_map { .user-view .user_map {
float: left; float: left;
} }

2
app/assets/stylesheets/small.css.scss
View file

@ -107,7 +107,7 @@ h1 {
border-right: 0px; border-right: 0px;
} }
#content.site_index { .site-index #content {
left: 0px; left: 0px;
right: 0px; right: 0px;
top: 38px; top: 38px;

2
app/views/layouts/site.html.erb
View file

@ -6,7 +6,7 @@
<%= link_to(image_tag("osm_logo.png", :size => "16x16", :border => 0, :alt => t('layouts.logo.alt_text')), root_path) %> <%= 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> <h1><%= t 'layouts.project_name.h1' %></h1>
</div> </div>
<div id="content" class="<%= params[:controller] %>_<%= params[:action] %>"> <div id="content">
<%= render :partial => "layouts/flash", :locals => { :flash => flash } %> <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
<%= yield %> <%= yield %>
</div> </div>