Skip to content

Commit

Permalink
Merge pull request #25 from jekyll/site-github-url
Browse files Browse the repository at this point in the history
Look for site.github.url if it exists
  • Loading branch information
benbalter committed Sep 6, 2016
2 parents 7ccdcc6 + c5ee203 commit 5f1c2bc
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 14 deletions.
8 changes: 5 additions & 3 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
<title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
<meta name="description" content="{{ page.excerpt | default: site.description | strip_html | normalize_whitespace | truncate: 160 | escape }}">

<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title | escape }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
{% assign custom_url = site.url | append: site.baseurl %}
{% assign full_base_url = site.github.url | default: custom_url %}
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: full_base_url }}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: full_base_url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title | escape }}" href="{{ "/feed.xml" | prepend: full_base_url }}">
</head>
6 changes: 4 additions & 2 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

<div class="wrapper">

<a class="site-title" href="{{ site.baseurl }}/">{{ site.title | escape }}</a>
{% assign custom_url = site.url | append: site.baseurl %}
{% assign full_base_url = site.github.url | default: custom_url %}
<a class="site-title" href="{{ full_base_url }}/">{{ site.title | escape }}</a>

<nav class="site-nav">
<a href="#" class="menu-icon">
Expand All @@ -16,7 +18,7 @@
<div class="trigger">
{% for my_page in site.pages %}
{% if my_page.title %}
<a class="page-link" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title | escape }}</a>
<a class="page-link" href="{{ my_page.url | prepend: full_base_url }}">{{ my_page.title | escape }}</a>
{% endif %}
{% endfor %}
</div>
Expand Down
4 changes: 4 additions & 0 deletions example/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
source "https://rubygems.org"

gem "jekyll", "~> 3.2"
gem "minima", path: "../"
18 changes: 12 additions & 6 deletions example/_config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
theme: minima
title: Your awesome title
email: your-email@domain.com
author: Mr. GitHub User
description: "Write an awesome description for your new site here. It will appear in your document head meta (for Google search results) and in your feed.xml site description."
email: your-email@domain.com
description: > # this means to ignore newlines until "baseurl:"
Write an awesome description for your new site here. You can edit this
line in _config.yml. It will appear in your document head meta (for
Google search results) and in your feed.xml site description.
baseurl: "/minima"
twitter_username: jekyllrb
github_username: jekyll

collections:
posts:
permalink: /posts/:title
# Build settings
markdown: kramdown
theme: minima
exclude:
- Gemfile
- Gemfile.lock
9 changes: 6 additions & 3 deletions example/index.html
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
---
layout: default
layout: page
---

<div class="home">

<h1 class="page-heading">Posts</h1>

{% assign custom_url = site.url | append: site.baseurl %}
{% assign full_base_url = site.github.url | default: custom_url %}

<ul class="post-list">
{% for post in site.posts %}
<li>
<span class="post-meta">{{ post.date | date: "%b %-d, %Y" }}</span>

<h2>
<a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title | escape }}</a>
<a class="post-link" href="{{ post.url | prepend: full_base_url }}">{{ post.title | escape }}</a>
</h2>
</li>
{% endfor %}
</ul>

<p class="rss-subscribe">subscribe <a href="{{ "/feed.xml" | prepend: site.baseurl }}">via RSS</a></p>
<p class="rss-subscribe">subscribe <a href="{{ "/feed.xml" | prepend: full_base_url }}">via RSS</a></p>

</div>

0 comments on commit 5f1c2bc

Please sign in to comment.