From 5d1d04c52c014171b911c3d7c23108e64f0ee9df Mon Sep 17 00:00:00 2001 From: Brandon Mathis Date: Tue, 12 Jul 2011 19:40:57 -0400 Subject: 1. Made default layout more generic. 2. Added a page layout and improved html on post layout. 3. Improved flexibility of stylesheets for different layout types. 4. Collapsing sidebar now moves it to the bottom of the page and floats content into columns. 5. Improved sharing settings, added Google plus one. --- .themes/classic/source/_layouts/default.html | 19 ++++-------------- .themes/classic/source/_layouts/page.html | 30 ++++++++++++++++++++++++++-- .themes/classic/source/_layouts/post.html | 14 +++++++------ 3 files changed, 40 insertions(+), 23 deletions(-) (limited to '.themes/classic/source/_layouts') diff --git a/.themes/classic/source/_layouts/default.html b/.themes/classic/source/_layouts/default.html index 4e4f81a3..15546bb5 100644 --- a/.themes/classic/source/_layouts/default.html +++ b/.themes/classic/source/_layouts/default.html @@ -2,25 +2,14 @@
{% include header.html %}
-
-
-
{{ content }}
+
+
+ {{ content }} {% unless page.sidebar == 'none' %} - + {% endunless %}
{% include footer.html %}
- {% if site.twitter_follow_button or site.twitter_tweet_button %} - - {% endif %} diff --git a/.themes/classic/source/_layouts/page.html b/.themes/classic/source/_layouts/page.html index 0c59c990..fe990dd7 100644 --- a/.themes/classic/source/_layouts/page.html +++ b/.themes/classic/source/_layouts/page.html @@ -1,5 +1,31 @@ --- -layout: post +layout: default --- - +
+
+
+

{{ page.title | titlecase }}

+ {% unless page.no_meta or !index %}

{% include post_date.html %}

{% endunless %} +
+ {{ content | smart_quotes }} + {% unless page.no_footer %} +
+ {% if page.date %} +

+ {% include post_date.html %} +

+ {% endif %} + {% unless page.no_sharing %} + {% include sharing.html %} + {% endunless %} +
+ {% endunless %} +
+{% if site.disqus_short_name and page.comments == true %} +
+

Comments

+
{% include disqus_thread.html %}
+
+{% endif %} +
diff --git a/.themes/classic/source/_layouts/post.html b/.themes/classic/source/_layouts/post.html index 5f55e89f..1e35ac72 100644 --- a/.themes/classic/source/_layouts/post.html +++ b/.themes/classic/source/_layouts/post.html @@ -3,22 +3,24 @@ layout: default single: true --- +
{% include article.html %} - {% unless page.no_meta %}

{% include post_author.html %} {% include post_date.html %} {% include post_categories.html %} - {% include sharing.html %}

+ {% unless page.no_sharing %} + {% include sharing.html %} + {% endunless %}
- {% endunless %} - {% if site.disqus_short_name %} +
+{% if site.disqus_short_name and page.no_comments != true %}

Comments

{% include disqus_thread.html %}
- {% endif %} - +{% endif %} +
-- cgit v1.2.1