Merge branch 'feature/custom-feed' into develop

This commit is contained in:
Michael Rose 2016-07-26 15:35:02 -04:00
commit a76fa288c9
3 changed files with 4 additions and 2 deletions

View file

@ -28,6 +28,8 @@ comments:
appid : appid :
num_posts : # 5 (default) num_posts : # 5 (default)
colorscheme : # "light" (default), "dark" colorscheme : # "light" (default), "dark"
atom_feed:
path : # blank (default) uses feed.xml
# SEO Related # SEO Related
google_site_verification : google_site_verification :

View file

@ -17,7 +17,7 @@
{% if site.author.bitbucket %} {% if site.author.bitbucket %}
<li><a href="http://bitbucket.org/{{ site.author.bitbucket }}"><i class="fa fa-fw fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li> <li><a href="http://bitbucket.org/{{ site.author.bitbucket }}"><i class="fa fa-fw fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li>
{% endif %} {% endif %}
<li><a href="{{ base_path }}/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].feed_label }}</a></li> <li><a href="{% if site.atom_feed.path %}{{ site.atom_feed.path }}{% else %}{{ base_path }}/feed.xml{% endif %}"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].feed_label }}</a></li>
</ul> </ul>
</div> </div>

View file

@ -4,7 +4,7 @@
{% include seo.html %} {% include seo.html %}
<link href="{{ base_path }}/feed.xml" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed"> <link href="{% if site.atom_feed.path %}{{ site.atom_feed.path }}{% else %}{{ base_path }}/feed.xml{% endif %}" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed">
<!-- http://t.co/dKP3o1e --> <!-- http://t.co/dKP3o1e -->
<meta name="HandheldFriendly" content="True"> <meta name="HandheldFriendly" content="True">