From 7d7416894a3a0605c0399e84153a320aabfa48d7 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 16 Feb 2011 17:12:48 +0000 Subject: [PATCH] New version of slim layout with grey background and centered, auto-adjusting page --- app/views/layouts/slim.html.erb | 36 +++++++++++++++++---------------- public/stylesheets/common.css | 20 +++++++++++++++++- 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/app/views/layouts/slim.html.erb b/app/views/layouts/slim.html.erb index e738f4c92..a97e526b1 100644 --- a/app/views/layouts/slim.html.erb +++ b/app/views/layouts/slim.html.erb @@ -18,27 +18,29 @@ <%= yield :head %> <%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %> - + +
+
+
+ <% if flash[:error] %> +
<%= flash[:error] %>
+ <% end %> + <% if flash[:warning] %> +
<%= flash[:warning] %>
+ <% end %> + <% if flash[:notice] %> +
<%= flash[:notice] %>
+ <% end %> -
- <% if flash[:error] %> -
<%= flash[:error] %>
- <% end %> - <% if flash[:warning] %> -
<%= flash[:warning] %>
- <% end %> - <% if flash[:notice] %> -
<%= flash[:notice] %>
- <% end %> + <%= yield %> +
- <%= yield %> +
+

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

+
+
-
-

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

-
- - diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css index c3f1c274e..c89bbe5e4 100644 --- a/public/stylesheets/common.css +++ b/public/stylesheets/common.css @@ -10,6 +10,10 @@ body { padding: 0px; } +body.slim { + background-color: #f0f0f0; +} + /* Rules for links */ a { @@ -547,6 +551,21 @@ hr { text-align: left; } +#slim_container { + width: 100%; +} + +#slim_container_content { + max-width: 50em; + height: 650px; + background-color: #FFFFFF; + margin: 10px auto; + padding: 3px; + border-radius: 25px; + -moz-border-radius: 25px; + border: 1px solid #e6e6e6; +} + #slim_content { margin: 10px; position: absolute; @@ -556,7 +575,6 @@ hr { #slim_header { margin: 10px; - background: url('../images/tab_bottom.gif') repeat-x bottom; } #slim_header img { -- 2.39.5