dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2319 from jekyll/use-urls

This commit is contained in:
Parker Moore 2014-05-07 00:39:35 -04:00
parent ac666490d2 216f1150cd
commit 0905b2c1e4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/site_template/_includes/head.html
View File

@ -4,7 +4,7 @@
<title>{% if page.title %}{{ page.title }}{% else %}{{ site.name }}{% endif %}</title>
<meta name="viewport" content="width=device-width">
<meta name="description" content="{{ site.description }}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl }}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<!-- Custom CSS -->
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">

2
lib/site_template/_includes/header.html
View File

@ -2,7 +2,7 @@
<div class="wrap">
<a class="site-title" href="{{ site.baseurl }}">{{ site.name }}</a>
<a class="site-title" href="{{ site.baseurl }}/">{{ site.name }}</a>
<nav class="site-nav">
<a href="#" class="menu-icon">

8
lib/site_template/feed.xml
View File

@ -6,15 +6,15 @@ layout: none
<channel>
<title>{{ site.name | xml_escape }}</title>
<description>{{ site.description | xml_escape }}</description>
<link>{{ site.baseurl }}</link>
<atom:link href="{{ "/feed.xml" | prepend: site.baseurl }}" rel="self" type="application/rss+xml" />
<link>{{ site.url }}{{ site.baseurl }}/</link>
<atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml" />
{% for post in site.posts limit:10 %}
<item>
<title>{{ post.title | xml_escape }}</title>
<description>{{ post.content | xml_escape }}</description>
<pubDate>{{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate>
<link>{{ post.url | prepend: site.baseurl }}</link>
<guid isPermaLink="true">{{ post.url | prepend: site.baseurl }}</guid>
<link>{{ post.url | prepend: site.baseurl | prepend: site.url }}</link>
<guid isPermaLink="true">{{ post.url | prepend: site.baseurl | prepend: site.url }}</guid>
</item>
{% endfor %}
</channel>