Fixed a display glitch that affected Opera: the contents of the page would display underneath the fixed navigation section at the top.

git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@267 a4c988fc-2ded-0310-b66e-134b36920a42
This commit is contained in:
bsag 2006-06-24 13:57:31 +00:00
parent d6ac8086d6
commit 0edb198e39
3 changed files with 16 additions and 9 deletions

View file

@ -50,6 +50,8 @@
</ul>
</div>
</div>
<div id="content">
<div id="info"></div>
<% unless @controller_name == 'feed' or session['noexpiry'] == "on" -%>
<%= periodically_call_remote( :url => {:controller => "login", :action => "check_expiry"},
@ -58,6 +60,7 @@
<%= periodically_call_remote( :url => {:controller => "todo", :action => "check_tickler"},
:frequency => (10*60)) %>
<%= @content_for_layout %>
</div>
<div id="footer">
<p>Send feedback: <a href="http://dev.rousette.org.uk/report/6">Trac</a> | <a href="http://www.rousette.org.uk/projects/wiki/">Wiki</a> | <a href="mailto:butshesagirl@rousette.org.uk?subject=Tracks feedback">Email</a> | <a href="http://www.rousette.org.uk/projects/">Website</a></p>

View file

@ -8,11 +8,11 @@ ActiveRecord::Schema.define(:version => 8) do
t.column "name", :string, :default => "", :null => false
t.column "position", :integer, :default => 0, :null => false
t.column "hide", :boolean, :default => false
t.column "user_id", :integer, :default => 1, :null => false
t.column "user_id", :integer, :default => 1
end
create_table "notes", :force => true do |t|
t.column "user_id", :integer, :default => 1, :null => false
t.column "user_id", :integer, :default => 0, :null => false
t.column "project_id", :integer, :default => 0, :null => false
t.column "body", :text
t.column "created_at", :datetime
@ -23,9 +23,8 @@ ActiveRecord::Schema.define(:version => 8) do
t.column "name", :string, :default => "", :null => false
t.column "position", :integer, :default => 0, :null => false
t.column "done", :boolean, :default => false
t.column "user_id", :integer, :default => 1, :null => false
t.column "description", :string, :default => ""
t.column "linkurl", :string, :default => ""
t.column "user_id", :integer, :default => 1
t.column "description", :text
end
create_table "sessions", :force => true do |t|
@ -45,7 +44,7 @@ ActiveRecord::Schema.define(:version => 8) do
t.column "created_at", :datetime
t.column "due", :date
t.column "completed", :datetime
t.column "user_id", :integer, :default => 1, :null => false
t.column "user_id", :integer, :default => 1
t.column "type", :string, :default => "Immediate", :null => false
t.column "show_from", :date
end

View file

@ -51,6 +51,10 @@ a.show_notes:hover {background-image: url(../images/notes_on.png); background-re
/* Structural divs */
#content {
margin-top: 90px;
}
#display_box {
float: left;
width: 55%;
@ -65,13 +69,13 @@ a.show_notes:hover {background-image: url(../images/notes_on.png); background-re
#full_width_display {
float: left;
width: 95%;
margin: 90px 15px 90px 15px;
margin: 0px 15px 90px 15px;
}
#display_box_projects {
float: left;
width: 95%;
margin: 90px 15px 90px 15px;
margin: 0px 15px 90px 15px;
}
/* Navigation links at the top */
@ -117,6 +121,7 @@ a.show_notes:hover {background-image: url(../images/notes_on.png); background-re
top: 0px;
left: 0px;
height: 68px;
margin-bottom: 20px;
clear: both;
background-color: #000;
filter: alpha(opacity=75);
@ -177,7 +182,7 @@ h2 a:hover {
}
#input_box {
margin: 100px 5% 0% 60%;
margin: 0% 5% 0% 60%;
padding: 0px 15px 0px 15px;
}