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

Merge pull request #2130 from XhmikosR/html-cleanup

This commit is contained in:
Parker Moore 2014-03-26 11:33:46 -04:00
parent 17329a1090 d227fa6302
commit 6706ce9ee7
14 changed files with 123 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
site/_includes/analytics.html
View File

@ -1,6 +1,6 @@
{% if site.gauges_id %}
<!-- Gauges (http://gaug.es/) -->
<script type="text/javascript">
<script>
var _gauges = _gauges || [];
(function() {
var t = document.createElement('script');
@ -17,7 +17,7 @@
{% if site.google_analytics_id %}
<!-- Google Analytics (http://google.com/analytics) -->
<script type="text/javascript">
<script>
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '{{ site.google_analytics_id }}']);
_gaq.push(['_setDomainName', '{{ site.url }}']); // Multiple sub-domains

4
site/_includes/css/style.css
View File

@ -157,8 +157,6 @@ body > footer img {
position: relative;
top: 8px;
margin-left: 5px;
width: 100px;
height: 30px;
opacity: .8;
padding: 1px;
-webkit-transition: opacity .2s;
@ -591,8 +589,6 @@ article h2:first-child {
}
.avatar {
width: 24px;
height: 24px;
border-radius: 3px;
display: inline-block;
vertical-align: middle;

2
site/_includes/docs_option.html
View File

@ -1,7 +1,7 @@
{% assign items = include.items %}
{% for item in items %}
{% assign item_url = item | prepend:'/docs/' | append:'/' %}
{% assign item_url = item | prepend:"/docs/" | append:"/" %}
{% for p in site.pages %}
{% if p.url == item_url %}

6
site/_includes/docs_ul.html
View File

@ -2,12 +2,12 @@
<ul>
{% for item in items %}
{% assign item_url = item | prepend:'/docs/' | append:'/' %}
{% assign item_url = item | prepend:"/docs/" | append:"/" %}
{% if item_url == page.url %}
{% assign c = 'current' %}
{% assign c = "current" %}
{% else %}
{% assign c = '' %}
{% assign c = "" %}
{% endif %}
{% for p in site.pages %}

2
site/_includes/footer.html
View File

@ -7,7 +7,7 @@
<p>
Proudly hosted by
<a href="https://github.com">
<img src="{{ site.url }}/img/footer-logo.png" alt="GitHub • Social coding">
<img src="/img/footer-logo.png" width="100" height="30" alt="GitHub • Social coding">
</a>
</p>
</div>

4
site/_includes/header.html
View File

@ -5,9 +5,9 @@
<div class="grid">
<div class="unit one-third center-on-mobiles">
<h1>
<a href="{{ site.url }}/">
<a href="/">
<span>Jekyll</span>
<img src="{{ site.url }}/img/logo-2x.png" width="249" height="115" alt="">
<img src="/img/logo-2x.png" width="249" height="115" alt="Logo">
</a>
</h1>
</div>

2
site/_includes/news_item.html
View File

@ -14,7 +14,7 @@
{{ post.date | date_to_string }}
</span>
<a href="https://github.com/{{ post.author }}" class="post-author">
<img src="https://github.com/{{ post.author }}.png" class="avatar" alt="{{ post.author }}"/>
<img src="https://github.com/{{ post.author }}.png" class="avatar" alt="{{ post.author }}" width="24" height="24">
{{ post.author }}
</a>
</div>

8
site/_includes/primary-nav-items.html
View File

@ -1,14 +1,14 @@
<ul>
<li class="{% if page.overview %}current{% endif %}">
<a href="{{ site.url }}/">Overview</a>
<a href="/">Overview</a>
</li>
<li class="{% if page.url contains '/docs/' %}current{% endif %}">
<a href="{{ site.url }}/docs/home/">Doc<span class="show-on-mobiles">s</span><span class="hide-on-mobiles">umentation</span></a>
<a href="/docs/home/">Doc<span class="show-on-mobiles">s</span><span class="hide-on-mobiles">umentation</span></a>
</li>
<li class="{% if page.author %}current{% endif %}">
<a href="{{ site.url }}/news/">News</a>
<a href="/news/">News</a>
</li>
<li class="">
<li>
<a href="{{ site.repository }}"><span class="hide-on-mobiles">View on </span>GitHub</a>
</li>
</ul>

4
site/_includes/section_nav.html
View File

@ -1,7 +1,7 @@
<div class="section-nav">
<div class="left align-right">
{% if page.prev_section != null %}
<a href="{{ site.url }}/docs/{{ page.prev_section }}/" class="prev">
<a href="/docs/{{ page.prev_section }}/" class="prev">
Back
</a>
{% else %}
@ -10,7 +10,7 @@
</div>
<div class="right align-left">
{% if page.next_section != null %}
<a href="{{ site.url }}/docs/{{ page.next_section }}/" class="next">
<a href="/docs/{{ page.next_section }}/" class="next">
Next
</a>
{% else %}

13
site/_includes/top.html
View File

@ -4,11 +4,10 @@
<meta charset="UTF-8">
<title>{{ page.title }}</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="alternate" type="application/rss+xml" title="Jekyll • Simple, blog-aware, static sites - Feed" href="/feed.xml" />
<link rel="alternate" type="application/atom+xml" title="Recent commits to Jekyll’s master branch" href="{{ site.repository }}/commits/master.atom" />
<link href='http://fonts.googleapis.com/css?family=Lato:100,300,400,700,900,100italic,300italic,400italic,700italic,900italic' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Arizonia' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="{{ site.url }}/css/screen.css" />
<link rel="icon" type="image/png" href="{{ site.url }}/favicon.png" />
<script src="{{ site.url }}/js/modernizr-2.7.1.min.js"></script>
<link rel="alternate" type="application/rss+xml" title="Jekyll • Simple, blog-aware, static sites - Feed" href="/feed.xml">
<link rel="alternate" type="application/atom+xml" title="Recent commits to Jekyll’s master branch" href="{{ site.repository }}/commits/master.atom">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:100,300,400,700,900,100italic,300italic,400italic,700italic,900italic">
<link rel="stylesheet" href="/css/screen.css">
<link rel="icon" type="image/png" href="/favicon.png">
<script src="/js/modernizr-2.7.1.min.js"></script>
</head>

2
site/_layouts/news_item.html
View File

@ -17,7 +17,7 @@ layout: news
{{ page.date | date_to_string }}
</span>
<a href="https://github.com/{{ page.author }}" class="post-author">
<img src="https://github.com/{{ page.author }}.png" class="avatar" />
<img src="https://github.com/{{ page.author }}.png" class="avatar" alt="{{ page.author }}" width="24" height="24">
{{ page.author }}
</a>
</div>

102
site/docs/configuration.md
View File

@ -31,65 +31,65 @@ class="flag">flags</code> (specified on the command-line) that control them.
</tr>
</thead>
<tbody>
<tr class='setting'>
<tr class="setting">
<td>
<p class='name'><strong>Site Source</strong></p>
<p class='description'>Change the directory where Jekyll will read files</p>
<p class="name"><strong>Site Source</strong></p>
<p class="description">Change the directory where Jekyll will read files</p>
</td>
<td class="align-center">
<p><code class="option">source: DIR</code></p>
<p><code class="flag">-s, --source DIR</code></p>
</td>
</tr>
<tr class='setting'>
<tr class="setting">
<td>
<p class='name'><strong>Site Destination</strong></p>
<p class='description'>Change the directory where Jekyll will write files</p>
<p class="name"><strong>Site Destination</strong></p>
<p class="description">Change the directory where Jekyll will write files</p>
</td>
<td class="align-center">
<p><code class="option">destination: DIR</code></p>
<p><code class="flag">-d, --destination DIR</code></p>
</td>
</tr>
<tr class='setting'>
<tr class="setting">
<td>
<p class='name'><strong>Safe</strong></p>
<p class='description'>Disable <a href="../plugins/">custom plugins, and ignore symbolic links</a>.</p>
<p class="name"><strong>Safe</strong></p>
<p class="description">Disable <a href="../plugins/">custom plugins, and ignore symbolic links</a>.</p>
</td>
<td class="align-center">
<p><code class="option">safe: BOOL</code></p>
<p><code class="flag">--safe</code></p>
</td>
</tr>
<tr class='setting'>
<tr class="setting">
<td>
<p class='name'><strong>Exclude</strong></p>
<p class="name"><strong>Exclude</strong></p>
<p class="description">
Exclude directories and/or files from the
conversion. These exclusions are relative to the site's
source directory and cannot be outside the source directory.
</p>
</td>
<td class='align-center'>
<td class="align-center">
<p><code class="option">exclude: [DIR, FILE, ...]</code></p>
</td>
</tr>
<tr class='setting'>
<tr class="setting">
<td>
<p class='name'><strong>Include</strong></p>
<p class="name"><strong>Include</strong></p>
<p class="description">
Force inclusion of directories and/or files in the conversion.
<code>.htaccess</code> is a good example since dotfiles are excluded
by default.
</p>
</td>
<td class='align-center'>
<td class="align-center">
<p><code class="option">include: [DIR, FILE, ...]</code></p>
</td>
</tr>
<tr class='setting'>
<tr class="setting">
<td>
<p class='name'><strong>Time Zone</strong></p>
<p class="name"><strong>Time Zone</strong></p>
<p class="description">
Set the time zone for site generation. This sets the <code>TZ</code>
environment variable, which Ruby uses to handle time and date
@ -99,13 +99,13 @@ class="flag">flags</code> (specified on the command-line) that control them.
is the local time zone, as set by your operating system.
</p>
</td>
<td class='align-center'>
<td class="align-center">
<p><code class="option">timezone: TIMEZONE</code></p>
</td>
</tr>
<tr class='setting'>
<tr class="setting">
<td>
<p class='name'><strong>Encoding</strong></p>
<p class="name"><strong>Encoding</strong></p>
<p class="description">
Set the encoding of files by name. Only available for Ruby
1.9 or later).
@ -116,7 +116,7 @@ class="flag">flags</code> (specified on the command-line) that control them.
command <code>ruby -e 'puts Encoding::list.join("\n")'</code>.
</p>
</td>
<td class='align-center'>
<td class="align-center">
<p><code class="option">encoding: ENCODING</code></p>
</td>
</tr>
@ -135,59 +135,59 @@ class="flag">flags</code> (specified on the command-line) that control them.
</tr>
</thead>
<tbody>
<tr class='setting'>
<tr class="setting">
<td>
<p class='name'><strong>Regeneration</strong></p>
<p class='description'>Enable auto-regeneration of the site when files are modified.</p>
<p class="name"><strong>Regeneration</strong></p>
<p class="description">Enable auto-regeneration of the site when files are modified.</p>
</td>
<td class="align-center">
<p><code class="flag">-w, --watch</code></p>
</td>
</tr>
<tr class='setting'>
<tr class="setting">
<td>
<p class='name'><strong>Configuration</strong></p>
<p class="name"><strong>Configuration</strong></p>
<p class="description">Specify config files instead of using <code>_config.yml</code> automatically. Settings in later files override settings in earlier files.</p>
</td>
<td class='align-center'>
<td class="align-center">
<p><code class="flag">--config FILE1[,FILE2,...]</code></p>
</td>
</tr>
<tr class='setting'>
<tr class="setting">
<td>
<p class='name'><strong>Drafts</strong></p>
<p class="name"><strong>Drafts</strong></p>
<p class="description">Process and render draft posts.</p>
</td>
<td class='align-center'>
<td class="align-center">
<p><code class="flag">--drafts</code></p>
</td>
</tr>
<tr class='setting'>
<tr class="setting">
<td>
<p class='name'><strong>Future</strong></p>
<p class="name"><strong>Future</strong></p>
<p class="description">Publish posts with a future date.</p>
</td>
<td class='align-center'>
<td class="align-center">
<p><code class="option">future: BOOL</code></p>
<p><code class="flag">--future</code></p>
</td>
</tr>
<tr class='setting'>
<tr class="setting">
<td>
<p class='name'><strong>LSI</strong></p>
<p class="name"><strong>LSI</strong></p>
<p class="description">Produce an index for related posts.</p>
</td>
<td class='align-center'>
<td class="align-center">
<p><code class="option">lsi: BOOL</code></p>
<p><code class="flag">--lsi</code></p>
</td>
</tr>
<tr class='setting'>
<tr class="setting">
<td>
<p class='name'><strong>Limit Posts</strong></p>
<p class="name"><strong>Limit Posts</strong></p>
<p class="description">Limit the number of posts to parse and publish.</p>
</td>
<td class='align-center'>
<td class="align-center">
<p><code class="option">limit_posts: NUM</code></p>
<p><code class="flag">--limit_posts NUM</code></p>
</td>
@ -211,40 +211,40 @@ before your site is served.
</tr>
</thead>
<tbody>
<tr class='setting'>
<tr class="setting">
<td>
<p class='name'><strong>Local Server Port</strong></p>
<p class='description'>Listen on the given port.</p>
<p class="name"><strong>Local Server Port</strong></p>
<p class="description">Listen on the given port.</p>
</td>
<td class="align-center">
<p><code class="option">port: PORT</code></p>
<p><code class="flag">--port PORT</code></p>
</td>
</tr>
<tr class='setting'>
<tr class="setting">
<td>
<p class='name'><strong>Local Server Hostname</strong></p>
<p class='description'>Listen at the given hostname.</p>
<p class="name"><strong>Local Server Hostname</strong></p>
<p class="description">Listen at the given hostname.</p>
</td>
<td class="align-center">
<p><code class="option">host: HOSTNAME</code></p>
<p><code class="flag">--host HOSTNAME</code></p>
</td>
</tr>
<tr class='setting'>
<tr class="setting">
<td>
<p class='name'><strong>Base URL</strong></p>
<p class='description'>Serve the website from the given base URL</p>
<p class="name"><strong>Base URL</strong></p>
<p class="description">Serve the website from the given base URL</p>
</td>
<td class="align-center">
<p><code class="option">baseurl: URL</code></p>
<p><code class="flag">--baseurl URL</code></p>
</td>
</tr>
<tr class='setting'>
<tr class="setting">
<td>
<p class='name'><strong>Detach</strong></p>
<p class='description'>Detach the server from the terminal</p>
<p class="name"><strong>Detach</strong></p>
<p class="description">Detach the server from the terminal</p>
</td>
<td class="align-center">
<p><code class="option">detach: BOOL</code></p>

88
site/docs/templates.md
View File

@ -25,162 +25,162 @@ common tasks easier.
<tbody>
<tr>
<td>
<p class='name'><strong>Date to XML Schema</strong></p>
<p class="name"><strong>Date to XML Schema</strong></p>
<p>Convert a Date into XML Schema (ISO 8601) format.</p>
</td>
<td class='align-center'>
<td class="align-center">
<p>
<code class='filter'>{% raw %}{{ site.time | date_to_xmlschema }}{% endraw %}</code>
<code class="filter">{% raw %}{{ site.time | date_to_xmlschema }}{% endraw %}</code>
</p>
<p>
<code class='output'>2008-11-07T13:07:54-08:00</code>
<code class="output">2008-11-07T13:07:54-08:00</code>
</p>
</td>
</tr>
<tr>
<td>
<p class='name'><strong>Date to RFC-822 Format</strong></p>
<p class="name"><strong>Date to RFC-822 Format</strong></p>
<p>Convert a Date into the RFC-822 format used for RSS feeds.</p>
</td>
<td class='align-center'>
<td class="align-center">
<p>
<code class='filter'>{% raw %}{{ site.time | date_to_rfc822 }}{% endraw %}</code>
<code class="filter">{% raw %}{{ site.time | date_to_rfc822 }}{% endraw %}</code>
</p>
<p>
<code class='output'>Mon, 07 Nov 2008 13:07:54 -0800</code>
<code class="output">Mon, 07 Nov 2008 13:07:54 -0800</code>
</p>
</td>
</tr>
<tr>
<td>
<p class='name'><strong>Date to String</strong></p>
<p class="name"><strong>Date to String</strong></p>
<p>Convert a date to short format.</p>
</td>
<td class='align-center'>
<td class="align-center">
<p>
<code class='filter'>{% raw %}{{ site.time | date_to_string }}{% endraw %}</code>
<code class="filter">{% raw %}{{ site.time | date_to_string }}{% endraw %}</code>
</p>
<p>
<code class='output'>07 Nov 2008</code>
<code class="output">07 Nov 2008</code>
</p>
</td>
</tr>
<tr>
<td>
<p class='name'><strong>Date to Long String</strong></p>
<p class="name"><strong>Date to Long String</strong></p>
<p>Format a date to long format.</p>
</td>
<td class='align-center'>
<td class="align-center">
<p>
<code class='filter'>{% raw %}{{ site.time | date_to_long_string }}{% endraw %}</code>
<code class="filter">{% raw %}{{ site.time | date_to_long_string }}{% endraw %}</code>
</p>
<p>
<code class='output'>07 November 2008</code>
<code class="output">07 November 2008</code>
</p>
</td>
</tr>
<tr>
<td>
<p class='name'><strong>XML Escape</strong></p>
<p class="name"><strong>XML Escape</strong></p>
<p>Escape some text for use in XML.</p>
</td>
<td class='align-center'>
<td class="align-center">
<p>
<code class='filter'>{% raw %}{{ page.content | xml_escape }}{% endraw %}</code>
<code class="filter">{% raw %}{{ page.content | xml_escape }}{% endraw %}</code>
</p>
</td>
</tr>
<tr>
<td>
<p class='name'><strong>CGI Escape</strong></p>
<p class="name"><strong>CGI Escape</strong></p>
<p>
CGI escape a string for use in a URL. Replaces any special characters
with appropriate %XX replacements.
</p>
</td>
<td class='align-center'>
<td class="align-center">
<p>
<code class='filter'>{% raw %}{{ “foo,bar;baz?” | cgi_escape }}{% endraw %}</code>
<code class="filter">{% raw %}{{ “foo,bar;baz?” | cgi_escape }}{% endraw %}</code>
</p>
<p>
<code class='output'>foo%2Cbar%3Bbaz%3F</code>
<code class="output">foo%2Cbar%3Bbaz%3F</code>
</p>
</td>
</tr>
<tr>
<td>
<p class='name'><strong>URI Escape</strong></p>
<p class="name"><strong>URI Escape</strong></p>
<p>
URI escape a string.
</p>
</td>
<td class='align-center'>
<td class="align-center">
<p>
<code class='filter'>{% raw %}{{ “'foo, bar \\baz?'” | uri_escape }}{% endraw %}</code>
<code class="filter">{% raw %}{{ “'foo, bar \\baz?'” | uri_escape }}{% endraw %}</code>
</p>
<p>
<code class='output'>foo,%20bar%20%5Cbaz?</code>
<code class="output">foo,%20bar%20%5Cbaz?</code>
</p>
</td>
</tr>
<tr>
<td>
<p class='name'><strong>Number of Words</strong></p>
<p class="name"><strong>Number of Words</strong></p>
<p>Count the number of words in some text.</p>
</td>
<td class='align-center'>
<td class="align-center">
<p>
<code class='filter'>{% raw %}{{ page.content | number_of_words }}{% endraw %}</code>
<code class="filter">{% raw %}{{ page.content | number_of_words }}{% endraw %}</code>
</p>
<p>
<code class='output'>1337</code>
<code class="output">1337</code>
</p>
</td>
</tr>
<tr>
<td>
<p class='name'><strong>Array to Sentence</strong></p>
<p class="name"><strong>Array to Sentence</strong></p>
<p>Convert an array into a sentence. Useful for listing tags.</p>
</td>
<td class='align-center'>
<td class="align-center">
<p>
<code class='filter'>{% raw %}{{ page.tags | array_to_sentence_string }}{% endraw %}</code>
<code class="filter">{% raw %}{{ page.tags | array_to_sentence_string }}{% endraw %}</code>
</p>
<p>
<code class='output'>foo, bar, and baz</code>
<code class="output">foo, bar, and baz</code>
</p>
</td>
</tr>
<tr>
<td>
<p class='name'><strong>Textilize</strong></p>
<p class="name"><strong>Textilize</strong></p>
<p>Convert a Textile-formatted string into HTML, formatted via RedCloth</p>
</td>
<td class='align-center'>
<td class="align-center">
<p>
<code class='filter'>{% raw %}{{ page.excerpt | textilize }}{% endraw %}</code>
<code class="filter">{% raw %}{{ page.excerpt | textilize }}{% endraw %}</code>
</p>
</td>
</tr>
<tr>
<td>
<p class='name'><strong>Markdownify</strong></p>
<p class="name"><strong>Markdownify</strong></p>
<p>Convert a Markdown-formatted string into HTML.</p>
</td>
<td class='align-center'>
<td class="align-center">
<p>
<code class='filter'>{% raw %}{{ page.excerpt | markdownify }}{% endraw %}</code>
<code class="filter">{% raw %}{{ page.excerpt | markdownify }}{% endraw %}</code>
</p>
</td>
</tr>
<tr>
<td>
<p class='name'><strong>Data To JSON</strong></p>
<p class="name"><strong>Data To JSON</strong></p>
<p>Convert Hash or Array to JSON.</p>
</td>
<td class='align-center'>
<td class="align-center">
<p>
<code class='filter'>{% raw %}{{ site.data.projects | jsonify }}{% endraw %}</code>
<code class="filter">{% raw %}{{ site.data.projects | jsonify }}{% endraw %}</code>
</p>
</td>
</tr>

10
site/index.html
View File

@ -18,19 +18,19 @@ overview: true
<p>
No more databases, comment moderation, or pesky updates to install—just <em>your content</em>.
</p>
<a href="/docs/usage/" class="">How Jekyll works &rarr;</a>
<a href="/docs/usage/">How Jekyll works &rarr;</a>
</div>
<div class="unit one-third">
<h2>Static</h2>
<p><a href="http://daringfireball.net/projects/markdown/">Markdown</a> (or <a href="http://textile.sitemonks.com/">Textile</a>), <a href="http://wiki.shopify.com/Liquid">Liquid</a>, HTML <span class="amp">&amp;</span> CSS go in. Static sites come out ready for deployment.</p>
<a href="/docs/templates/" class="">Jekyll template guide &rarr;</a>
<a href="/docs/templates/">Jekyll template guide &rarr;</a>
</div>
<div class="unit one-third">
<h2>Blog-aware</h2>
<p>
Permalinks, categories, pages, posts, and custom layouts are all first-class citizens here.
</p>
<a href="/docs/migrations/" class="">Migrate your blog &rarr;</a>
<a href="/docs/migrations/">Migrate your blog &rarr;</a>
</div>
<div class="clear"></div>
</div>
@ -76,11 +76,11 @@ overview: true
<div class="unit whole">
<div class="grid pane">
<div class="unit whole center-on-mobiles">
<img src="img/octojekyll.png" alt="Free Jekyll hosting on GitHub Pages">
<img src="img/octojekyll.png" width="300" height="251" alt="Free Jekyll hosting on GitHub Pages">
<div class="pane-content">
<h2 class="center-on-mobiles"><strong>Free hosting</strong> with GitHub Pages</h2>
<p>Sick of dealing with hosting companies? <a href="http://pages.github.com/">GitHub Pages</a> are <em>powered by Jekyll</em>, so you can easily deploy your site using GitHub for free&mdash;<a href="https://help.github.com/articles/setting-up-a-custom-domain-with-pages">custom domain name</a> and&nbsp;all.</p>
<a href="http://pages.github.com/" class="">Learn more about GitHub Pages &rarr;</a>
<a href="http://pages.github.com/">Learn more about GitHub Pages &rarr;</a>
</div>
</div>
<div class="clear"></div>