diff options
| -rw-r--r-- | sass/parts/_article.scss | 3 | ||||
| -rw-r--r-- | sass/parts/_post.scss | 2 | ||||
| -rw-r--r-- | sass/parts/_syntax.scss | 2 | ||||
| -rw-r--r-- | source/_includes/article.html | 40 | ||||
| -rw-r--r-- | source/_includes/post/categories.html | 12 | ||||
| -rw-r--r-- | source/javascripts/slash.js | 2 |
6 files changed, 27 insertions, 34 deletions
diff --git a/sass/parts/_article.scss b/sass/parts/_article.scss index 52151ef..91f6273 100644 --- a/sass/parts/_article.scss +++ b/sass/parts/_article.scss @@ -17,7 +17,7 @@ article{ color: $color-gray01; } } - .entry{ + .entry-content{ line-height: 2; text-align: justify; a{ @@ -114,6 +114,7 @@ article{ left: 0; width: 100%; height: 100%; + margin-top: 0; } } } diff --git a/sass/parts/_post.scss b/sass/parts/_post.scss index 1730fb8..fc4bf6d 100644 --- a/sass/parts/_post.scss +++ b/sass/parts/_post.scss @@ -1,5 +1,5 @@ .post{ - h1.title, .entry{ + h1.title, .entry-content{ margin-left: 200px; @media screen and (max-width: 800px){ margin-left: 0; diff --git a/sass/parts/_syntax.scss b/sass/parts/_syntax.scss index 5ad2b14..0a95988 100644 --- a/sass/parts/_syntax.scss +++ b/sass/parts/_syntax.scss @@ -124,7 +124,7 @@ figure.code{ overflow-x: auto; } } -.entry .gist{ +.entry-content .gist{ background: $pre-bg; color: $color-gray01; padding: 30px 15px 5px; diff --git a/source/_includes/article.html b/source/_includes/article.html index a766bb7..1e1c835 100644 --- a/source/_includes/article.html +++ b/source/_includes/article.html @@ -1,25 +1,19 @@ {% if index %} - <h1 class="title"><a href="{{ root_url }}{{ post.url }}">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h1> - <div class="entry"> - {{ content | excerpt }} - {% capture excerpted %}{{ content | has_excerpt }}{% endcapture %} - {% if excerpted == 'true' %}<a href="{{ root_url }}{{ post.url }}" class="more-link">{{ site.excerpt_link }}</a>{% endif %} - </div> - <div class="meta"> - <div class="date">{% include post/date.html %}{{ time }}</div> - <div class="tags">{% include post/categories.html %}</div> - {% if site.disqus_short_name and post.comments == true and site.disqus_show_comment_count == true %} - <span class="comments"><a href="{{ root_url }}{{ post.url }}#disqus_thread">Comments</a></span> - {% endif %} - </div> + <h1 class="title"><a href="{{ root_url }}{{ post.url }}">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h1> + <div class="entry-content"> + {{ content | excerpt }} + {% capture excerpted %}{{ content | has_excerpt }}{% endcapture %} + {% if excerpted == 'true' %}<a href="{{ root_url }}{{ post.url }}" class="more-link">{{ site.excerpt_link }}</a>{% endif %} + </div> {% else %} - <h1 class="title">{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}</h1> - <div class="entry">{{ content }}</div> - <div class="meta"> - <div class="date">{% include post/date.html %}{{ time }}</div> - <div class="tags">{% include post/categories.html %}</div> - {% if site.disqus_short_name and page.comments == true and site.disqus_show_comment_count == true %} - <span class="comments"><a href="{{ root_url }}{{ post.url }}#disqus_thread">Comments</a></span> - {% endif %} - </div> -{% endif %}
\ No newline at end of file + <h1 class="title">{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}</h1> + <div class="entry-content">{{ content }}</div> +{% endif %} + +<div class="meta"> + <div class="date">{% include post/date.html %}{{ time }}</div> + <div class="tags">{% include post/categories.html %}</div> + {% if site.disqus_short_name and site.disqus_show_comment_count == true %} + <span class="comments"><a href="{{ root_url }}{{ post.url }}{{ page.url }}#disqus_thread">Comments</a></span> + {% endif %} +</div>
\ No newline at end of file diff --git a/source/_includes/post/categories.html b/source/_includes/post/categories.html index 2ec7896..8c1c81f 100644 --- a/source/_includes/post/categories.html +++ b/source/_includes/post/categories.html @@ -1,10 +1,8 @@ {% capture category %}{% if post %}{{ post.categories | category_links | size }}{% else %}{{ page.categories | category_links | size }}{% endif %}{% endcapture %} {% unless category == '0' %} -<div class="cat"> - {% if post %} - {{ post.categories | category_links }} - {% else %} - {{ page.categories | category_links }} - {% endif %} -</div> +{% if post %} + {{ post.categories | category_links }} +{% else %} + {{ page.categories | category_links }} +{% endif %} {% endunless %} diff --git a/source/javascripts/slash.js b/source/javascripts/slash.js index 1e2649d..6433ba0 100644 --- a/source/javascripts/slash.js +++ b/source/javascripts/slash.js @@ -51,7 +51,7 @@ // Append caption after pictures var appendCaption = function(){ - $('.entry').each(function(i){ + $('.entry-content').each(function(i){ var _i = i; $(this).find('img').each(function(){ var alt = this.alt; |