Merge pull request #878 from Eric-Guo/eric_fix

typo and utf-8 encode fix - repull request
This commit is contained in:
Brandon Mathis 2012-12-21 07:56:49 -08:00
commit be443098d6
4 changed files with 16 additions and 18 deletions

View File

@ -1,6 +1,4 @@
{% if site.google_plus_user %}
<a href="https://plus.google.com/{{ site.google_plus_user }}?rel=author">
<img src="https://ssl.gstatic.com/images/icons/gplus-{{ site.google_plus_image_size}}.png" alt="Google Plus icon">
</a>
<a href="https://plus.google.com/{{ site.google_plus_user }}?rel=author"><img src="https://ssl.gstatic.com/images/icons/gplus-{{ site.google_plus_image_size}}.png" alt="Google Plus icon"></a>
{% endif %}

View File

@ -25,10 +25,10 @@ layout: default
</div>
{% unless page.sidebar == false or site.default_sidebar == false %}
<aside class="sidebar">
  {% if page.sidebar == nil or page.sidebar == 'collapse' %}
   {% include_sidebar site.page_sidebar %}
  {% else %}
   {% include_sidebar %}
  {% endif %}
{% if page.sidebar == nil or page.sidebar == 'collapse' %}
{% include_sidebar site.page_sidebar %}
{% else %}
{% include_sidebar %}
{% endif %}
</aside>
{% endunless %}

View File

@ -30,10 +30,10 @@ single: true
</div>
{% unless page.sidebar == false or site.default_sidebar == false %}
<aside class="sidebar">
  {% if page.sidebar == nil or page.sidebar == 'collapse' %}
   {% include_sidebar site.post_sidebar %}
  {% else %}
   {% include_sidebar %}
  {% endif %}
{% if page.sidebar == nil or page.sidebar == 'collapse' %}
{% include_sidebar site.post_sidebar %}
{% else %}
{% include_sidebar %}
{% endif %}
</aside>
{% endunless %}

View File

@ -21,10 +21,10 @@ layout: default
</div>
{% unless page.sidebar == false or site.default_sidebar == false %}
<aside class="sidebar">
  {% if page.sidebar == nil or page.sidebar == 'collapse' %}
   {% include_sidebar site.blog_index_sidebar %}
  {% else %}
   {% include_sidebar %}
  {% endif %}
{% if page.sidebar == nil or page.sidebar == 'collapse' %}
{% include_sidebar site.blog_index_sidebar %}
{% else %}
{% include_sidebar %}
{% endif %}
</aside>
{% endunless %}