From cbbc48091c9a83b4e15ff887b4f1d660dba69dfd Mon Sep 17 00:00:00 2001 From: SkyArrow Date: Wed, 25 Jan 2012 01:12:01 +0800 Subject: page layout --- sass/_parts.scss | 2 ++ sass/parts/_article.scss | 3 --- sass/parts/_page.scss | 3 +++ sass/parts/_post.scss | 5 +++++ source/_layouts/page.html | 38 ++++++++++---------------------------- 5 files changed, 20 insertions(+), 31 deletions(-) create mode 100644 sass/parts/_page.scss create mode 100644 sass/parts/_post.scss diff --git a/sass/_parts.scss b/sass/_parts.scss index 5c88ad5..ef45fc9 100644 --- a/sass/_parts.scss +++ b/sass/_parts.scss @@ -2,6 +2,8 @@ @import "parts/banner"; @import "parts/index"; @import "parts/article"; +@import "parts/post"; +@import "parts/page"; @import "parts/comment"; @import "parts/footer"; @import "parts/syntax"; \ No newline at end of file diff --git a/sass/parts/_article.scss b/sass/parts/_article.scss index aa0233f..f4b6e62 100644 --- a/sass/parts/_article.scss +++ b/sass/parts/_article.scss @@ -3,9 +3,6 @@ article{ border-top: 1px solid $light-shadow; padding: 30px 0; position: relative; - h1.title, .entry{ - margin-left: 200px; - } h1.title{ font-size: 25px; font-weight: 300; diff --git a/sass/parts/_page.scss b/sass/parts/_page.scss new file mode 100644 index 0000000..e219789 --- /dev/null +++ b/sass/parts/_page.scss @@ -0,0 +1,3 @@ +.page{ + +} \ No newline at end of file diff --git a/sass/parts/_post.scss b/sass/parts/_post.scss new file mode 100644 index 0000000..bbd6029 --- /dev/null +++ b/sass/parts/_post.scss @@ -0,0 +1,5 @@ +.post{ + h1.title, .entry{ + margin-left: 200px; + } +} \ No newline at end of file diff --git a/source/_layouts/page.html b/source/_layouts/page.html index 9a02019..886029e 100644 --- a/source/_layouts/page.html +++ b/source/_layouts/page.html @@ -2,34 +2,16 @@ layout: default --- -
- {% if page.title %} -
-

{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}

- {% if page.date %}

{% include post/date.html %}{{ time }}

{% endif %} -
- {% endif %} - {{ content }} - {% unless page.footer == false %} -
- {% if page.date or page.author %}

- {% if page.author %}{% include post/author.html %}{% endif %} - {% include post/date.html %}{% if updated %}{{ updated }}{% else %}{{ time }}{% endif %} - {% if page.categories %}{% include post/categories.html %}{% endif %} -

{% endif %} - {% unless page.sharing == false %} - {% include post/sharing.html %} - {% endunless %} -
- {% endunless %} +
+ {% if page.title %} +

{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}

+ {% endif %} + {{ content }}
+{% include post/sharing.html %} {% if site.disqus_short_name and page.comments == true %} -
-

Comments

+
+

留言

{% include post/disqus_thread.html %}
-
-{% endif %} -{% unless page.sidebar == false %} -{% include asides.html %} -{% endunless %} -
\ No newline at end of file +
+{% endif %} \ No newline at end of file -- cgit v1.1-2-g2b99