diff options
| -rw-r--r-- | sass/_parts.scss | 1 | ||||
| -rw-r--r-- | sass/parts/_archive.scss | 65 | ||||
| -rw-r--r-- | sass/parts/_article.scss | 27 | ||||
| -rw-r--r-- | sass/parts/_post.scss | 27 | ||||
| -rw-r--r-- | source/_includes/archive_post.html | 15 | ||||
| -rw-r--r-- | source/_layouts/category_index.html | 23 | ||||
| -rw-r--r-- | source/blog/archives/index.html | 27 |
7 files changed, 125 insertions, 60 deletions
diff --git a/sass/_parts.scss b/sass/_parts.scss index 72df504..4e6c6ae 100644 --- a/sass/_parts.scss +++ b/sass/_parts.scss @@ -3,6 +3,7 @@ @import "parts/article"; @import "parts/post"; @import "parts/page"; +@import "parts/archive"; @import "parts/comment"; @import "parts/footer"; @import "parts/syntax"; diff --git a/sass/parts/_archive.scss b/sass/parts/_archive.scss new file mode 100644 index 0000000..ad96dc2 --- /dev/null +++ b/sass/parts/_archive.scss @@ -0,0 +1,65 @@ +section.archive{ + position: relative; + &:first-of-type{ + border-top: 1px solid $light-shadow; + article.archive{ + border-top: none; + } + h1.archive-title{ + border-top: none; + &:before{ + border-top: none; + } + } + } + &:last-of-type{ + border-bottom: 1px solid $border; + article.archive{ + border-bottom: none; + } + } + h1.archive-title{ + font-size: 25px; + font-weight: 300; + line-height: 35px; + width: 200px; + position: absolute; + top: 0; + padding-top: 30px; + border-top: 1px solid #fff; + &:before{ + content: ""; + position: absolute; + top: -2px; + width: 100%; + border-top: 1px solid #ddd; + } + } + article.archive{ + margin-left: 200px; + .meta{ + color: $font-meta; + span{ + margin-right: 30px; + padding-left: 30px; + display: inline-block; + } + a{ + color: $font-meta; + @include transition(0.3s); + &:hover{ + color: $font-main; + } + } + .date{ + background: image-url('date.png') 0 center no-repeat; + } + .tags{ + background: image-url('tags.png') 0 center no-repeat; + } + .comments{ + background: image-url('comments.png') 0 center no-repeat; + } + } + } +}
\ No newline at end of file diff --git a/sass/parts/_article.scss b/sass/parts/_article.scss index eae9eaf..4423eee 100644 --- a/sass/parts/_article.scss +++ b/sass/parts/_article.scss @@ -95,33 +95,6 @@ article{ padding-left: 25px; } } - .meta{ - position: absolute; - top: 85px; - line-height: 2; - font-size: 13px; - color: $font-meta; - width: 170px; - a{ - color: $font-meta; - @include transition(0.3s); - &:hover{ - color: $font-main; - } - } - .date, .tags, .comments{ - padding-left: 30px; - } - .date{ - background: image-url('date.png') 0 center no-repeat; - } - .tags{ - background: image-url('tags.png') 0 center no-repeat; - } - .comments{ - background: image-url('comments.png') 0 center no-repeat; - } - } } .share{ padding: 15px 0; diff --git a/sass/parts/_post.scss b/sass/parts/_post.scss index bbd6029..b27b4c7 100644 --- a/sass/parts/_post.scss +++ b/sass/parts/_post.scss @@ -2,4 +2,31 @@ h1.title, .entry{ margin-left: 200px; } + .meta{ + position: absolute; + top: 85px; + line-height: 2; + font-size: 13px; + color: $font-meta; + width: 170px; + a{ + color: $font-meta; + @include transition(0.3s); + &:hover{ + color: $font-main; + } + } + .date, .tags, .comments{ + padding-left: 30px; + } + .date{ + background: image-url('date.png') 0 center no-repeat; + } + .tags{ + background: image-url('tags.png') 0 center no-repeat; + } + .comments{ + background: image-url('comments.png') 0 center no-repeat; + } + } }
\ No newline at end of file diff --git a/source/_includes/archive_post.html b/source/_includes/archive_post.html index 5693f95..b30e5d8 100644 --- a/source/_includes/archive_post.html +++ b/source/_includes/archive_post.html @@ -1,8 +1,9 @@ {% capture category %}{{ post.categories | size }}{% endcapture %} -<h1><a href="{{ root_url }}{{ post.url }}">{{post.title}}</a></h1> -<time datetime="{{ post.date | datetime | date_to_xmlschema }}" pubdate>{{ post.date | date: "<span class='month'>%b</span> <span class='day'>%d</span> <span class='year'>%Y</span>"}}</time> -{% if category != '0' %} -<footer> - <span class="categories">posted in {{ post.categories | category_links }}</span> -</footer> -{% endif %}
\ No newline at end of file +<h1 class="title"><a href="{{ root_url }}{{ post.url }}">{{post.title}}</a></h1> +<div class="meta"> + <span class="date">{{ post.date | date: "%b %e" }}</span> + <span class="tags">{% include post/categories.html %}</span> + {% if site.disqus_short_name and post.comments == true %} + <span class="comments"><a href="{% if index %}{{ root_url }}{{ post.url }}{% endif %}#disqus_thread">留言</a></span> + {% endif %} +</div>
\ No newline at end of file diff --git a/source/_layouts/category_index.html b/source/_layouts/category_index.html index 85a6307..7e64ebe 100644 --- a/source/_layouts/category_index.html +++ b/source/_layouts/category_index.html @@ -1,17 +1,16 @@ --- -layout: page -footer: false +layout: default --- -<div id="blog-archives" class="category"> {% for post in site.categories[page.category] %} -{% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %} -{% unless year == this_year %} - {% assign year = this_year %} - <h2>{{ year }}</h2> -{% endunless %} -<article> - {% include archive_post.html %} -</article> +<section class="archive"> + {% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %} + {% unless year == this_year %} + {% assign year = this_year %} + <h1 class="archive-title">{{ year }}</h1> + {% endunless %} + <article class="archive"> + {% include archive_post.html %} + </article> +</section> {% endfor %} -</div> diff --git a/source/blog/archives/index.html b/source/blog/archives/index.html index f1d9cee..043e163 100644 --- a/source/blog/archives/index.html +++ b/source/blog/archives/index.html @@ -1,18 +1,17 @@ --- -layout: page -title: Blog Archive -footer: false +layout: default +title: 文章彙整 --- -<div id="blog-archives"> {% for post in site.posts reverse %} -{% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %} -{% unless year == this_year %} - {% assign year = this_year %} - <h2>{{ year }}</h2> -{% endunless %} -<article> - {% include archive_post.html %} -</article> -{% endfor %} -</div> +<section class="archive"> + {% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %} + {% unless year == this_year %} + {% assign year = this_year %} + <h1 class="archive-title">{{ year }}</h1> + {% endunless %} + <article class="archive"> + {% include archive_post.html %} + </article> +</section> +{% endfor %}
\ No newline at end of file |