From e4c2d5790bac6a74037638fde049c374fc44cc7b Mon Sep 17 00:00:00 2001 From: Brandon Mathis Date: Sun, 17 Apr 2011 22:49:30 -0500 Subject: irrisponsibly massive commit --- source/_layouts/blog_post.haml | 32 -------------------------------- source/_layouts/default.haml | 32 -------------------------------- source/_layouts/default.html | 15 +++++++++++++++ source/_layouts/post.html | 10 ++++++++++ 4 files changed, 25 insertions(+), 64 deletions(-) delete mode 100644 source/_layouts/blog_post.haml delete mode 100644 source/_layouts/default.haml create mode 100644 source/_layouts/default.html create mode 100644 source/_layouts/post.html (limited to 'source/_layouts') 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 @@ + + +{% include head.html %} + +
{% include header.html %}
+ +
+
+
{{ content }}
+ +
+
+ + + 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 +--- + +
+ {% include article.html %} + {% if site.disqus_short_name %} +
{% include disqus_thread.html %}
+ {% endif %} +
-- cgit v1.2.1