From: Tom Hughes Date: Wed, 30 Jan 2013 18:17:04 +0000 (+0000) Subject: Show the header block on slim layout pages X-Git-Tag: live~5216 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/773f145edc8999fc5a9bd1440cc1d4f6b1f465cb?ds=sidebyside Show the header block on slim layout pages --- diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index aa2e893aa..e57db18ce 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -802,12 +802,16 @@ ul.results-list li { border-bottom: 1px solid #ccc; } #slim_content { margin: 10px; - margin-top: 90px; + margin-top: 95px; max-width: 50em; + + .content-heading { + margin-bottom: 15px; + } } #slim_header { - margin: 10px; + margin: 30px 10px; position: absolute; top: 0px; margin-right: 5px; diff --git a/app/views/layouts/slim.html.erb b/app/views/layouts/slim.html.erb index ba02104f4..72cfcec31 100644 --- a/app/views/layouts/slim.html.erb +++ b/app/views/layouts/slim.html.erb @@ -1,17 +1,23 @@ - + <%= render :partial => "layouts/head" %>
+
+

<%= image_tag("osm_logo.png", :size => "60x60", :border => 0, :alt => t('layouts.logo.alt_text')) %><%= t 'layouts.project_name.h1' %>

+
+
<%= render :partial => "layouts/flash", :locals => { :flash => flash } %> - <%= yield %> -
+ <% if content_for? :heading %> +
+ <%= yield :heading %> +
+ <% end %> -
-

<%= image_tag("osm_logo.png", :size => "60x60", :border => 0, :alt => t('layouts.logo.alt_text')) %><%= t 'layouts.project_name.h1' %>

+ <%= yield %>