diff options
| author | Brandon Mathis <brandon@imathis.com> | 2011-07-12 19:40:57 -0400 |
|---|---|---|
| committer | Brandon Mathis <brandon@imathis.com> | 2011-07-12 19:40:57 -0400 |
| commit | 5d1d04c52c014171b911c3d7c23108e64f0ee9df (patch) | |
| tree | 21a58dcdfb8def51d69d4f180fce134cf4ecc9ec /.themes/classic/source/_layouts | |
| parent | 67c5edb2f6eb8747a659109fe160b4c54f6e2917 (diff) | |
| download | my_new_personal_website-5d1d04c52c014171b911c3d7c23108e64f0ee9df.tar.xz my_new_personal_website-5d1d04c52c014171b911c3d7c23108e64f0ee9df.zip | |
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.
Diffstat (limited to '.themes/classic/source/_layouts')
| -rw-r--r-- | .themes/classic/source/_layouts/default.html | 19 | ||||
| -rw-r--r-- | .themes/classic/source/_layouts/page.html | 30 | ||||
| -rw-r--r-- | .themes/classic/source/_layouts/post.html | 14 |
3 files changed, 40 insertions, 23 deletions
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 @@ <body {% if page.body_id %} id="{{ page.body_id }}" {% endif %} {% if page.sidebar == 'none' %} class="no-sidebar" {% endif %}> <header>{% include header.html %}</header> <nav>{% include navigation.html %}</nav> - <div> - <div> - <div id="articles" {% if page.blog_index %} class="blog-index" {% endif %}>{{ content }}</div> + <div id="main"> + <div id="content"> + {{ content }} {% unless page.sidebar == 'none' %} - <aside>{% include sidebar.html %}</aside> + <aside role=sidebar>{% include sidebar.html %}</aside> {% endunless %} </div> </div> <footer>{% include footer.html %}</footer> - {% if site.twitter_follow_button or site.twitter_tweet_button %} - <script type="text/javascript"> - (function(){ - var twitterWidgets = document.createElement('script'); - twitterWidgets.type = 'text/javascript'; - twitterWidgets.async = true; - twitterWidgets.src = 'http://platform.twitter.com/widgets.js'; - document.getElementsByTagName('head')[0].appendChild(twitterWidgets); - })(); - </script> - {% endif %} </body> </html> 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 --- -<!-- if you want a page layout --> +<div> +<article> + <header> + <h1 class="entry-title">{{ page.title | titlecase }}</h1> + {% unless page.no_meta or !index %}<p class="meta">{% include post_date.html %}</p>{% endunless %} + </header> + {{ content | smart_quotes }} + {% unless page.no_footer %} + <footer> + {% if page.date %} + <p class="meta"> + {% include post_date.html %} + </p> + {% endif %} + {% unless page.no_sharing %} + {% include sharing.html %} + {% endunless %} + </footer> + {% endunless %} +</article> +{% if site.disqus_short_name and page.comments == true %} + <section> + <h1>Comments</h1> + <div id="disqus_thread">{% include disqus_thread.html %}</div> + </section> +{% endif %} +</div> 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 --- +<div> <article class="hentry"> {% include article.html %} - {% unless page.no_meta %} <footer> <p class="meta"> {% include post_author.html %} {% include post_date.html %} {% include post_categories.html %} - {% include sharing.html %} </p> + {% unless page.no_sharing %} + {% include sharing.html %} + {% endunless %} </footer> - {% endunless %} - {% if site.disqus_short_name %} +</article> +{% if site.disqus_short_name and page.no_comments != true %} <section> <h1>Comments</h1> <div id="disqus_thread">{% include disqus_thread.html %}</div> </section> - {% endif %} -</article> +{% endif %} +</div> |