Merge pull request #160 from mhagnumdw/feed_description

Feed title and description
sylhare · May 29, 2019 · e7fcc28 · e7fcc28
2 parents 417f277 + 75ff540
commit e7fcc28
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/_config.yml b/_config.yml
@@ -7,7 +7,6 @@ description: "A website with blog posts and pages" # used by search engines
 # THEME-SPECIFIC CONFIGURATION
 theme_settings:
   # Meta
-  title: Type on Strap # blog's title
   avatar: assets/img/triangle.svg
   color_image: /assets/img/lineart.png # In post when you set color
   favicon: assets/favicon.ico

diff --git a/_includes/head.html b/_includes/head.html
@@ -15,7 +15,7 @@
     <link rel="canonical" href="{{ page.url | replace:'index.html','' | absolute_url }}">
 
     <!-- RSS -->
-    <link rel="alternate" type="application/atom+xml" title="{{ site.theme_settings.title }}" href="{{ 'feed.xml' | absolute_url }}"/>
+    <link rel="alternate" type="application/atom+xml" title="{{ site.title }}" href="{{ 'feed.xml' | absolute_url }}"/>
 
     {% if page.bootstrap %}
     <!-- Bootstrap-4.1.3 isolation CSS -->
@@ -60,7 +60,7 @@
     {% seo %}
     <!-- Manual seo tags -->
     <!--
-    <title>{% if page.title %}{{ page.title }} |{% endif %} {{ site.theme_settings.title }}</title>
+    <title>{% if page.title %}{{ page.title }} |{% endif %} {{ site.title }}</title>
     <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.theme_settings.description }}{% endif %}">
     -->
 </head>
diff --git a/_includes/navbar.html b/_includes/navbar.html
@@ -7,8 +7,8 @@
 		</a>
 
 		<h1 class="site-title">
-			<a aria-label="{{ site.theme_settings.title }}" href="{{ '/' | relative_url }}">
-        {{ site.theme_settings.title }}
+			<a aria-label="{{ site.title }}" href="{{ '/' | relative_url }}">
+        {{ site.title }}
       </a>
 		</h1>
 	</div>

diff --git a/_layouts/feed.xml b/_layouts/feed.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
     <channel>
-        <title>{{ site.theme_settings.title | xml_escape }}</title>
+        <title>{{ site.title | xml_escape }}</title>
         <atom:link href="{{ "/feed.xml" | absolute_url }}" rel="self" type="application/rss+xml"/>
         <link>{{ "/" | absolute_url }}</link>
-        <description>{{ site.theme_settings.description | xml_escape }}</description>
+        <description>{{ site.description | xml_escape }}</description>
         <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
         {% for post in site.posts limit:15 %}
         <item>