diff options
| author | Brandon Mathis <brandon@imathis.com> | 2011-04-17 22:49:30 -0500 |
|---|---|---|
| committer | Brandon Mathis <brandon@imathis.com> | 2011-04-17 22:49:30 -0500 |
| commit | e4c2d5790bac6a74037638fde049c374fc44cc7b (patch) | |
| tree | 83f5e5b7324fcb5951d755442e2e601a3eaed35a /source/_layouts | |
| parent | 4db81a9e51e452495a06ad8c57ac4ac689a9ff34 (diff) | |
| download | my_new_personal_website-e4c2d5790bac6a74037638fde049c374fc44cc7b.tar.xz my_new_personal_website-e4c2d5790bac6a74037638fde049c374fc44cc7b.zip | |
irrisponsibly massive commit
Diffstat (limited to '')
| -rw-r--r-- | source/_layouts/blog_post.haml | 32 | ||||
| -rw-r--r-- | source/_layouts/default.haml | 32 | ||||
| -rw-r--r-- | source/_layouts/default.html | 15 | ||||
| -rw-r--r-- | source/_layouts/post.html | 10 |
4 files changed, 25 insertions, 64 deletions
diff --git a/source/_layouts/blog_post.haml b/source/_layouts/blog_post.haml deleted file mode 100644 index 8201632e..00000000 --- a/source/_layouts/blog_post.haml +++ /dev/null @@ -1,32 +0,0 @@ ---- -blog_title: My Octopress Blog -author: - -twitter_user: -tweet_count: 3 -show_replies: false - -delicious_user: -delicious_count: 3 - -full_url: -disqus_short_name: - -google_custom_search_id: -google_analytics_tracking_id: - ---- - -!!! 1.1 Transitional -%html(xmlns="http://www.w3.org/1999/xhtml" xml:lang="en") - - = include "head.haml" - %body(id="#{(page.respond_to?(:body_id) ? page.body_id : nil)}") - #header= include "header.haml" - #nav= include "navigation.haml" - #page - #content - #main - .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 deleted file mode 100644 index 279682dd..00000000 --- a/source/_layouts/default.haml +++ /dev/null @@ -1,32 +0,0 @@ ---- -blog_title: My Octopress Blog -author: - -twitter_user: imathis -tweet_count: 3 -show_replies: false - -delicious_user: -delicious_count: 3 - -full_url: -disqus_short_name: - -google_custom_search_id: -google_analytics_tracking_id: - ---- - -!!! 1.1 Transitional -%html(xmlns="http://www.w3.org/1999/xhtml" xml:lang="en") - - = include "head.haml" - %body(id="#{(page.respond_to?(:body_id) ? page.body_id : nil)}") - #header= include "header.haml" - #nav= include "navigation.haml" - #page - #content - #main - .content= preserve rp(content) - #sidebar= include "sidebar.haml" - = include "footer.haml"
\ No newline at end of file diff --git a/source/_layouts/default.html b/source/_layouts/default.html new file mode 100644 index 00000000..553c1bec --- /dev/null +++ b/source/_layouts/default.html @@ -0,0 +1,15 @@ +<!DOCTYPE html> +<html> +{% include head.html %} +<body id="{{ page.body_id }}"> + <header><div>{% include header.html %}</div></header> + <nav id="nav"><div>{% include navigation.html %}</div></nav> + <div id="page"> + <div> + <div id="main"><article>{{ content }}</article></div> + <aside>{% include sidebar.html %}</aside> + </div> + </div> + <footer><div>{% include footer.html %}</div></footer> +</body> +</html> diff --git a/source/_layouts/post.html b/source/_layouts/post.html new file mode 100644 index 00000000..3b568349 --- /dev/null +++ b/source/_layouts/post.html @@ -0,0 +1,10 @@ +--- +layout: default +--- + +<article> + {% include article.html %} + {% if site.disqus_short_name %} + <div id="disqus_thread">{% include disqus_thread.html %}</div> + {% endif %} +</article> |