diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/_includes/footer.haml | 2 | ||||
| -rw-r--r-- | source/_includes/header.haml | 7 | ||||
| -rw-r--r-- | source/_includes/navigation.haml | 2 | ||||
| -rw-r--r-- | source/_layouts/blog_post.haml | 4 | ||||
| -rw-r--r-- | source/_layouts/default.haml | 5 | ||||
| -rw-r--r-- | source/_posts/2009-11-13-hello-world.markdown | 1 | ||||
| -rw-r--r-- | source/javascripts/octopress.js | 2 |
7 files changed, 13 insertions, 10 deletions
diff --git a/source/_includes/footer.haml b/source/_includes/footer.haml index 3385617d..99870db8 100644 --- a/source/_includes/footer.haml +++ b/source/_includes/footer.haml @@ -1,5 +1,5 @@ #footer - .page_width + .content Copyright © #{Time.now.strftime('%Y')} - #{page.blog_title} - %span.credit Powered by <a href="http://octopress.org">Octopress</a> diff --git a/source/_includes/header.haml b/source/_includes/header.haml index ce1d054a..f4b821f9 100644 --- a/source/_includes/header.haml +++ b/source/_includes/header.haml @@ -1,6 +1,7 @@ -.page_width - %a.title(href="/")=page.blog_title - - if page.respond_to? :google_custom_search_id +.content + %h1 + %a.title(href="/")=page.blog_title + - if page.respond_to?(:google_custom_search_id) && page.google_custom_search_id #search %form(action="http://www.google.com/cse" id="cse-search-box") %input(type="hidden" name="cx" value="#{page.google_custom_search_id}") diff --git a/source/_includes/navigation.haml b/source/_includes/navigation.haml index 4b273fcf..8ee0bfe9 100644 --- a/source/_includes/navigation.haml +++ b/source/_includes/navigation.haml @@ -1,4 +1,4 @@ -.page_width +.content %ul %li.alpha %a(href="/") Blog diff --git a/source/_layouts/blog_post.haml b/source/_layouts/blog_post.haml index 112df953..8201632e 100644 --- a/source/_layouts/blog_post.haml +++ b/source/_layouts/blog_post.haml @@ -25,8 +25,8 @@ google_analytics_tracking_id: #header= include "header.haml" #nav= include "navigation.haml" #page - .page_width + #content #main - .blog= include "post.haml" + .blog.content= include "post.haml" #sidebar= include "sidebar.haml" = include "footer.haml"
\ No newline at end of file diff --git a/source/_layouts/default.haml b/source/_layouts/default.haml index ef41e254..9f4468b7 100644 --- a/source/_layouts/default.haml +++ b/source/_layouts/default.haml @@ -25,7 +25,8 @@ google_analytics_tracking_id: #header= include "header.haml" #nav= include "navigation.haml" #page - .page_width - #main= preserve rp(content) + #content + #main + .content= preserve rp(content) #sidebar= include "sidebar.haml" = include "footer.haml"
\ No newline at end of file diff --git a/source/_posts/2009-11-13-hello-world.markdown b/source/_posts/2009-11-13-hello-world.markdown index 35cda1d5..40ac3255 100644 --- a/source/_posts/2009-11-13-hello-world.markdown +++ b/source/_posts/2009-11-13-hello-world.markdown @@ -1,5 +1,6 @@ --- title: Hello World! I'm Octopress! +updated: March 10th, 2010 --- **Octopress is a blogging framework designed for hackers**, based on [Jekyll](http://github.com/mojombo/jekyll) the blog aware static site generator powering [Github pages](http://pages.github.com/). diff --git a/source/javascripts/octopress.js b/source/javascripts/octopress.js index 8e7c1a4f..d5173a47 100644 --- a/source/javascripts/octopress.js +++ b/source/javascripts/octopress.js @@ -17,7 +17,7 @@ function addExpander(div){ function toggleExpander(expander){ var html = ''; var expanderPos = expander.getPosition().y; - if($('main').toggleClass('expanded').hasClass('expanded')) + if($('page').toggleClass('expanded').hasClass('expanded')) html = '« contract'; else html = 'expand »'; |