diff options
-rw-r--r-- | sass/_parts.scss | 2 | ||||
-rw-r--r-- | sass/parts/_article.scss | 3 | ||||
-rw-r--r-- | sass/parts/_page.scss | 3 | ||||
-rw-r--r-- | sass/parts/_post.scss | 5 | ||||
-rw-r--r-- | source/_layouts/page.html | 38 |
5 files changed, 20 insertions, 31 deletions
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 --- -<article role="article"> - {% if page.title %} - <header> - <h1 class="entry-title">{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}</h1> - {% if page.date %}<p class="meta">{% include post/date.html %}{{ time }}</p>{% endif %} - </header> - {% endif %} - {{ content }} - {% unless page.footer == false %} - <footer> - {% if page.date or page.author %}<p class="meta"> - {% 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 %} - </p>{% endif %} - {% unless page.sharing == false %} - {% include post/sharing.html %} - {% endunless %} - </footer> - {% endunless %} +<article class="page"> + {% if page.title %} + <h1 class="title">{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}</h1> + {% endif %} + {{ content }} </article> +{% include post/sharing.html %} {% if site.disqus_short_name and page.comments == true %} - <section> - <h1>Comments</h1> +<section id="comment"> + <h1 class="title">留言</h1> <div id="disqus_thread" aria-live="polite">{% include post/disqus_thread.html %}</div> - </section> -{% endif %} -{% unless page.sidebar == false %} -{% include asides.html %} -{% endunless %} -<div class="clear"></div>
\ No newline at end of file +</section> +{% endif %}
\ No newline at end of file |