Mercurial > hg > soundsoftware-site
changeset 18:48e89e0a0b7f yuya
* Some stylesheet updates; give main title a distinguishable ID from project title
author | Chris Cannam |
---|---|
date | Fri, 10 Sep 2010 15:57:01 +0100 |
parents | cefbcad807b5 |
children | 56fdca7d85a5 |
files | app/views/layouts/base.rhtml public/themes/soundsoftware/stylesheets/application.css |
diffstat | 2 files changed, 22 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/app/views/layouts/base.rhtml Fri Sep 10 15:17:13 2010 +0100 +++ b/app/views/layouts/base.rhtml Fri Sep 10 15:57:01 2010 +0100 @@ -31,7 +31,7 @@ <%= render_menu :top_menu -%> </div> -<div id="header"> +<%= tag('div', {:id => 'header', :class => (display_main_menu?(@project) ? 'header-project' : 'header-general')}, true) %> <div id="quick-search"> <% form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %> <%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %> @@ -42,7 +42,7 @@ </div> <h1><%= page_header_title %></h1> - + <% if display_main_menu?(@project) %> <div id="main-menu"> <%= render_main_menu(@project) %>
--- a/public/themes/soundsoftware/stylesheets/application.css Fri Sep 10 15:17:13 2010 +0100 +++ b/public/themes/soundsoftware/stylesheets/application.css Fri Sep 10 15:57:01 2010 +0100 @@ -16,14 +16,7 @@ } h1 { - font-family: GilliusADFNo2, Cambria, Georgia, "Times New Roman", Times, serif; - font-weight: normal; -} - -#header h1 { -/* background: url('soundsoftware-logo-title-only.png') no-repeat 0 0; - text-indent: -9999px; */ - font-family: GilliusADFNo2, Cambria, Georgia, "Times New Roman", Times, serif; + font-family: GilliusADFNo2, 'Gill Sans', Tahoma, sans-serif; font-weight: normal; } @@ -34,19 +27,32 @@ h2 { font-size: 2em; } .box{ -padding:6px; +padding: 6px; margin-bottom: 10px; -background-color:#fdfaf0; -color:#3e442c; -line-height:1.5em; +background-color: #fdfbf5; +color: #3e442c; +line-height: 1.5em; border: 1px solid #be5700; } +.odd {background-color:#fdf7e4;} +.even {background-color: #fdfbf5;} + +#content .tabs { margin-bottom: 0; } + +table.list th { background-color: #fdfbf5; } + #top-menu { position: absolute; top: 0; z-index: 1; left: 0px; width: 100%; font-size: 90%; /* height: 2em; */ margin: 0; padding: 0; padding-top: 0.5em; background-color: #be5700; } #top-menu a { font-weight: bold; } #header { position: absolute; z-index: 0; top: 0; width: 100%; background: #fdfaf0; /* border-bottom: 2px solid #be5700; height:80px; */ padding: 10px 0 0 0; margin-bottom: 0; } #header a { color: #be5700; } -#header h1 { color: #3e422c; margin-top: 30px; font-size: 3em; font-weight: normal; margin-left: 0.3em; } +#header h1 { color: #525a38; margin-top: 30px; font-size: 3em; font-weight: normal; margin-left: 0.3em; } +.header-general h1 { + background: url('soundsoftware-logo-title-only.png') no-repeat 0 0; + text-indent: -9999px; + width: 446px; + height: 34px; + } #quick-search { margin-right: 6px; margin-top: 2em; color: #000; } #main-menu { position: absolute; top: 90px; background-color: #be5700; left: 0; border-top: 0; width: 100%; height: 1.82em; padding: 0; margin: 0; border: 0; } #main-menu li { margin: 0; padding: 0; padding-top: 1px; } @@ -57,7 +63,7 @@ #footer { background-color: #be5700; border: 0; color: #fff;} #footer a { color: #fff; font-weight: bold; } -#main { margin-top: 135px; font:95%; background: #e8eaec; } +#main { margin-top: 135px; font:95%; background: #fdfbf5; } #main a { font-weight: medium; color: #be5700;} #main a:hover { color: #be5700; text-decoration: underline; } #content { background: #fdfaf0; }