@@ -9,40 +9,48 @@ %p{:color => 'green'}= flash[:notice] -.sideBar - %b General Stuff - %br - = link_to "home", root_path - - Page.all.each do |page| - %br - = link_to page.title, page_url(page) - %br - %br - %b Recent Wiki Pages - %ul - - WikiEntry.all.each do |entry| - %li= link_to entry.title, wiki_entry_path(entry) - %br - %br - %b Recent Blog Posts - %br - %i None integrated yet - %br - %br - - %b Search for: - %br - - form_for :query, :url => root_path do |f| - = text_field_tag :query, 'enter your query', :size=> 12 - = f.submit "go" - - %br - %br - - = yield :sidebar - -.mainContent - = yield +%div{:style => "text-align:center;"} + .main{:style => "margin:auto"} + .sideBar + %br + %br + %br + %br + %i{:style => "font-size:11pt;"} This is the page of Andreas Happe: Student, music-fanatic, researcher and overall lost soul. + %br + %br + %i{:style => "font-size:11pt;"} Updating the blog in addition to twitter was to time intensive.. so this it is. + %br + %br + %br + %b Search for: + %br + - form_for :query, :url => root_path do |f| + = text_field_tag :query, 'enter your query', :size=> 10 + = f.submit "go" + %br + %b Pages + %br + = link_to "timeline", root_path + - Page.all.each do |page| + %br + = link_to page.title, page_url(page) + %br + %br + %b Recent Wiki Pages + - WikiEntry.all.each do |entry| + %br= link_to entry.title, wiki_entry_path(entry) + %br + %br + + + %br + %br + + = yield :sidebar + + .mainContent + = yield <div style="clear: both;"></div> app/views/layouts/application.html.haml @@ -6,11 +6,11 @@ - if group.first.is_a?(Tweet) %p= render :partial => 'posts/tweet', :object => group - - elsif group.first.is_a?(WikiEntry) - %p= render :partial => 'posts/wiki_entry', :object => group.first - - else - %p - %div - - if group.first.title - %b= group.first.title - = group.first.formatted_body + /- elsif group.first.is_a?(WikiEntry) + / %p= render :partial => 'posts/wiki_entry', :object => group.first + /- else + / %p + / %div + / - if group.first.title + / %b= group.first.title + / = group.first.formatted_body app/views/posts/index.html.haml @@ -1,16 +1,28 @@ body { - background-color: rgb(227, 227, 227); + background-color: white); +} + +.main { + width: 800px; + float: center; } .mainContent { - width: 600px; + float: left; + width: 590px; + padding: 0 0 0 5px; + text-align: left; } .sideBar { margin: 2px; + width: 170px; margin-left: 7px; - text-align: right; + text-align: left; float: right; + border-left: 1px dotted #DDDDDD; + word-wrap: break-word; + padding-left: 15px; } .wikiEntry { @@ -135,5 +147,5 @@ body { } .footer hr { - color: gray; + color: #DDDDDD; } public/stylesheets/styles.css 14a75a6b1c86986b04f23984bc57b1de1ad02a4d Andreas Happe andreashappe@snikt.net http://github.com/andreashappe/narcissism/commit/a1a357e5e4dac839fcbb9424ec3574e62aa2b7cc a1a357e5e4dac839fcbb9424ec3574e62aa2b7cc 2009-10-23T13:42:04-07:00 2009-10-23T13:42:04-07:00 chg: work on layout maybe this is easier on the eyes. fb4f1f6af0b1f7436bd2e6f372d481b89297693a Andreas Happe andreashappe@snikt.net