Merge branch 'master' into gh-pages

Conflicts:
	_includes/head.html

diff --git a/404.html b/404.html
index d05ddb0abb07e050413ef2440f41fdea1be9371b..9703ba819b75698f1260c1c97b3c81356f38cb96 100644 (file)
--- a/404.html
+++ b/404.html
@@ -6,5 +6,5 @@ permalink: 404.html
 
 <div class="page">
   <h1 class="page-title">404: Page not found</h1>
-  <p class="lead">Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. <a href="/">Head back home</a> to try finding it again.</p>
+  <p class="lead">Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. <a href="{{ site.baseurl }}">Head back home</a> to try finding it again.</p>
 </div>

diff --git a/README.md b/README.md
index c0bff196000f09ff0bc5b8bf4c93850ef9c4ccc3..457adb9f93685b60bef789acff883b1b0f5f22b5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Poole
 
-*The Strange Case of Dr. Jeykll and Mr. Hyde* tells the story of a lawyer investigating the connection of two persons, Dr. Henry Jekyll and Mr. Edward Hyde. Chief among the novel's supporting cast is a man by the name of Mr. Poole, Dr. Jekyll's loyal butler.
+*The Strange Case of Dr. Jekyll and Mr. Hyde* tells the story of a lawyer investigating the connection of two persons, Dr. Henry Jekyll and Mr. Edward Hyde. Chief among the novel's supporting cast is a man by the name of Mr. Poole, Dr. Jekyll's loyal butler.
 
 -----
 
@@ -58,7 +58,13 @@ To see your Jekyll site with Poole applied, start a Jekyll server. In Terminal,
 $ jekyll serve
 ```
 
-Open <http://localhost:4000> in your browser, and voilà. You're done.
+Open <http://localhost:4000> in your browser, and voilà.
+
+### 4. Serving it up
+
+If you host your code on GitHub, you can use [GitHub Pages](https://pages.github.com) to host your project. Simply create a `gh-pages` branch in your repository and push it to GitHub. Then head to `http://username.github.io/repo-name`.
+
+No matter your production or hosting setup, be sure to check your `baseurl` setting in the `_config.yml` file. For the above example, you'll want to change it from `/` to `/repo-name`. If you have a `CNAME` or host this at the root level of a domain, like `http://example.com`, there's no need to change anything. Not setting this correctly will mean broken styles on your site.
 
 
 ## Options
@@ -77,7 +83,7 @@ html {
   font-size: 16px;
   line-height: 1.5;
 }
-@media (min-width: 38rem) {
+@media (min-width: 38em) {
   html {
     font-size: 20px;
   }

diff --git a/_config.yml b/_config.yml
index c0f0356af4f13f83296ae224b8d3a90fd775f758..463c92d9c7693b40a9b095da7fd7d8c162a438bb 100644 (file)
--- a/_config.yml
+++ b/_config.yml
@@ -8,17 +8,15 @@ permalink:        pretty
 # Setup
 title:            Poole
 tagline:          The Jekyll Butler
-description:      Base theme for Jekyll themes by @mdo.
 url:              http://getpoole.com
-
+paginate:         1
+baseurl:          /
 author:
   name:           Mark Otto
-   url:           https://twitter.com/mdo
-
-paginate:         1
+  url:            https://twitter.com/mdo
+  email:          markdotto@gmail.com
 
 # Custom vars
 version:          1.0.0
-
 github:
   repo:           https://github.com/poole/poole

diff --git a/_includes/head.html b/_includes/head.html
index 3388fceef4846077c46988d44f3616dec4378929..b8276783407d40b32bc5bc596cfc8a0f2b45160e 100644 (file)
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -14,15 +14,15 @@
   </title>
 
   <!-- CSS -->
-  <link rel="stylesheet" href="/public/css/poole.css">
-  <link rel="stylesheet" href="/public/css/syntax.css">
+  <link rel="stylesheet" href="{{ site.baseurl }}public/css/poole.css">
+  <link rel="stylesheet" href="{{ site.baseurl }}public/css/syntax.css">
 
   <!-- Icons -->
-  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/public/apple-touch-icon-144-precomposed.png">
-                                 <link rel="shortcut icon" href="/public/favicon.ico">
+  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.baseurl }}public/apple-touch-icon-144-precomposed.png">
+  <link rel="shortcut icon" href="{{ site.baseurl }}public/favicon.ico">
 
   <!-- RSS -->
-  <link rel="alternate" type="application/rss+xml" title="RSS" href="/atom.xml">
+  <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ site.baseurl }}atom.xml">
 
   <!-- Google Analytics -->
   <script>

diff --git a/_layouts/default.html b/_layouts/default.html
index 9f5911a1ec7bfbdb9b521e5f5d703c5145c964f4..61620f22a4a05083c5730b33ddf7846ed8bd3c8e 100644 (file)
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -8,7 +8,7 @@
     <div class="container content">
       <div class="masthead">
         <h3 class="masthead-title">
-          <a href="/" title="Home">{{ site.title }}</a>
+          <a href="{{ site.baseurl }}" title="Home">{{ site.title }}</a>
           <small>{{ site.tagline }}</small>
         </h3>
       </div>

diff --git a/_layouts/post.html b/_layouts/post.html
index 2a6c7c1d9d36084d96105eda688dc51d65ab3e86..c027477605b3b1ddaafaa876cc5efbea8044ef55 100644 (file)
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -14,7 +14,7 @@ layout: default
     {% for post in site.related_posts limit:3 %}
       <li>
         <h3>
-          <a href="{{ post.url }}">
+          <a href="{{ site.baseurl }}{{ post.url }}">
             {{ post.title }}
             <small>{{ post.date | date_to_string }}</small>
           </a>

diff --git a/_posts/2013-12-31-whats-jekyll.md b/_posts/2013-12-31-whats-jekyll.md
index c102e15c083e2d441c3eafe4ad08cac69f5eca73..6cdd60efbbb5f73c536b321d9f366efec7160db1 100644 (file)
--- a/_posts/2013-12-31-whats-jekyll.md
+++ b/_posts/2013-12-31-whats-jekyll.md
@@ -5,8 +5,6 @@ title: What's Jekyll?
 \r
 [Jekyll](http://jekyllrb.com) is a static site generator, an open-source tool for creating simple yet powerful websites of all shapes and sizes. From [the project's readme](https://github.com/jekyll/jekyll/blob/master/README.markdown):\r
 \r
-  > Jekyll is a simple, blog aware, static site generator. It takes a template directory [...] and spits out a complete, static website suitable for serving with Apache or your favorite web server. This is also the engine behind GitHub Pages, which you can use to host your project’s page or blog right here from GitHub.\r
+> Jekyll is a simple, blog aware, static site generator. It takes a template directory [...] and spits out a complete, static website suitable for serving with Apache or your favorite web server. This is also the engine behind GitHub Pages, which you can use to host your project’s page or blog right here from GitHub.\r
 \r
-It's an immensely useful tool and one we encourage you to use here with Hyde.\r
-\r
-Find out more by [visiting the project on GitHub](https://github.com/jekyll/jekyll).\r
+It's an immensely useful tool. Find out more by [visiting the project on GitHub](https://github.com/jekyll/jekyll).\r

diff --git a/_posts/2014-01-01-example-content.md b/_posts/2014-01-01-example-content.md
index 340d14af667fdc136ae960f3a89bc1ccb55a6bb6..7dc8108543bb5698f5b5258b4ec48e092fc7db7a 100644 (file)
--- a/_posts/2014-01-01-example-content.md
+++ b/_posts/2014-01-01-example-content.md
@@ -85,6 +85,14 @@ Cras mattis consectetur purus sit amet fermentum. Sed posuere consectetur est at
 \r
 Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Nullam quis risus eget urna mollis ornare vel eu leo.\r
 \r
+### Images\r
+\r
+Quisque consequat sapien eget quam rhoncus, sit amet laoreet diam tempus. Aliquam aliquam metus erat, a pulvinar turpis suscipit at.\r
+\r
+![placeholder](http://placehold.it/800x400 "Large example image")\r
+![placeholder](http://placehold.it/400x200 "Medium example image")\r
+![placeholder](http://placehold.it/200x200 "Small example image")\r
+\r
 ### Tables\r
 \r
 Aenean lacinia bibendum nulla sed consectetur. Lorem ipsum dolor sit amet, consectetur adipiscing elit.\r

diff --git a/_posts/2014-01-02-introducing-poole.md b/_posts/2014-01-02-introducing-poole.md
index 84f5ed5282e434d7353ddeb681088c0608cffef6..39be93254eb7e632353143eff68ce7cb2acd33b5 100644 (file)
--- a/_posts/2014-01-02-introducing-poole.md
+++ b/_posts/2014-01-02-introducing-poole.md
@@ -3,7 +3,7 @@ layout: post
 title: Introducing Poole\r
 ---\r
 \r
-*The Strange Case of Dr. Jeykll and Mr. Hyde* tells the story of a lawyer investigating the connection of two persons, Dr. Henry Jekyll and Mr. Edward Hyde. Chief among the novel's supporting cast is a man by the name of Mr. Poole, Dr. Jekyll's loyal butler.\r
+*The Strange Case of Dr. Jekyll and Mr. Hyde* tells the story of a lawyer investigating the connection of two persons, Dr. Henry Jekyll and Mr. Edward Hyde. Chief among the novel's supporting cast is a man by the name of Mr. Poole, Dr. Jekyll's loyal butler.\r
 \r
 -----\r
 \r

diff --git a/about.md b/about.md
index 9b2605bb4cee862adc590665b04bea875a7473bd..9165fa96cee716727ff819292d7d3993c90771c4 100644 (file)
--- a/about.md
+++ b/about.md
@@ -7,7 +7,7 @@ title: About
   Hey there! This page is included as an example. Feel free to customize it for your own use upon downloading. Carry on!
 </p>
 
-In the novel, *The Strange Case of Dr. Jeykll and Mr. Hyde*, Mr. Poole is Dr. Jekyll's virtuous and loyal butler. Similarly, Poole is an upstanding and effective butler that helps you build Jekyll themes. It's made by [@mdo](https://twitter.com/mdo).
+In the novel, *The Strange Case of Dr. Jekyll and Mr. Hyde*, Mr. Poole is Dr. Jekyll's virtuous and loyal butler. Similarly, Poole is an upstanding and effective butler that helps you build Jekyll themes. It's made by [@mdo](https://twitter.com/mdo).
 
 There are currently two themes built on Poole:
 

diff --git a/atom.xml b/atom.xml
index 8a1a28c9b034bec0f80e8d8aec345ddb9c92919c..2e355d85b0889a87caee4606f5f05a90f3149709 100644 (file)
--- a/atom.xml
+++ b/atom.xml
@@ -6,8 +6,8 @@ layout: nil
 <feed xmlns="http://www.w3.org/2005/Atom">
 
  <title>{{ site.title }}</title>
- <link href="{{ site.url }}/atom.xml" rel="self"/>
- <link href="{{ site.url }}/"/>
+ <link href="{{ site.url }}{{ site.baseurl }}atom.xml" rel="self"/>
+ <link href="{{ site.url }}{{ site.baseurl }}"/>
  <updated>{{ site.time | date_to_xmlschema }}</updated>
  <id>{{ site.url }}</id>
  <author>
@@ -18,7 +18,7 @@ layout: nil
  {% for post in site.posts %}
  <entry>
    <title>{{ post.title }}</title>
-   <link href="{{ site.url }}{{ post.url }}"/>
+   <link href="{{ site.url }}{{ site.baseurl }}{{ post.url }}"/>
    <updated>{{ post.date | date_to_xmlschema }}</updated>
    <id>{{ site.url }}{{ post.id }}</id>
    <content type="html">{{ post.content | xml_escape }}</content>

diff --git a/index.html b/index.html
index dc0e6478e297862d137d924aae319b64648233d2..fe093d17710c2d7f75daaeb8f211262894158587 100644 (file)
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@ title: Home
   {% for post in paginator.posts %}
   <div class="post">
     <h1 class="post-title">
-      <a href="{{ post.url }}">
+      <a href="{{ site.baseurl }}{{ post.url }}">
         {{ post.title }}
       </a>
     </h1>
@@ -21,15 +21,15 @@ title: Home
 
 <div class="pagination">
   {% if paginator.next_page %}
-    <a class="pagination-item older" href="/page{{paginator.next_page}}">Older</a>
+    <a class="pagination-item older" href="{{ site.baseurl }}page{{paginator.next_page}}">Older</a>
   {% else %}
     <span class="pagination-item older">Older</span>
   {% endif %}
   {% if paginator.previous_page %}
     {% if paginator.page == 2 %}
-      <a class="pagination-item newer" href="/">Newer</a>
+      <a class="pagination-item newer" href="{{ site.baseurl }}">Newer</a>
     {% else %}
-      <a class="pagination-item newer" href="/page{{paginator.previous_page}}">Newer</a>
+      <a class="pagination-item newer" href="{{ site.baseurl }}page{{paginator.previous_page}}">Newer</a>
     {% endif %}
   {% else %}
     <span class="pagination-item newer">Newer</span>

diff --git a/public/css/poole.css b/public/css/poole.css
index 49309a1ab3f9b66de3d8d78ab4daee19414a1ec2..8ec27e7a8441866eca968039d5b6869c0aa87a0d 100644 (file)
--- a/public/css/poole.css
+++ b/public/css/poole.css
@@ -52,7 +52,7 @@ html {
   font-size: 16px;
   line-height: 1.5;
 }
-@media (min-width: 38rem) {
+@media (min-width: 38em) {
   html {
     font-size: 20px;
   }
@@ -70,6 +70,9 @@ a {
   color: #268bd2;
   text-decoration: none;
 }
+a strong {
+  color: inherit;
+}
 /* `:focus` is linked to `:hover` for basic accessibility */
 a:hover,
 a:focus {
@@ -217,7 +220,7 @@ blockquote {
 blockquote p:last-child {
   margin-bottom: 0;
 }
-@media (min-width: 30rem) {
+@media (min-width: 30em) {
   blockquote {
     padding-right: 5rem;
     padding-left: 1.25rem;
@@ -406,7 +409,7 @@ a.pagination-item:hover {
   background-color: #f5f5f5;
 }
 
-@media (min-width: 30rem) {
+@media (min-width: 30em) {
   .pagination {
     margin: 3rem 0;
   }

diff --git a/public/css/syntax.css b/public/css/syntax.css
index 1264b87f14e7e81c18ea1d53837fbe2683d33df7..7350c10513ea079178348a85f8b40e80aba6e3a4 100644 (file)
--- a/public/css/syntax.css
+++ b/public/css/syntax.css
@@ -1,65 +1,64 @@
-.hll { background-color: #ffffcc }
- /*{ background: #f0f3f3; }*/
+.hll { background-color: #ffc; }
 .c { color: #999; } /* Comment */
-.err { color: #AA0000; background-color: #FFAAAA } /* Error */
-.k { color: #006699; } /* Keyword */
-.o { color: #555555 } /* Operator */
-.cm { color: #0099FF; font-style: italic } /* Comment.Multiline */
-.cp { color: #009999 } /* Comment.Preproc */
+.err { color: #a00; background-color: #faa } /* Error */
+.k { color: #069; } /* Keyword */
+.o { color: #555 } /* Operator */
+.cm { color: #09f; font-style: italic } /* Comment.Multiline */
+.cp { color: #099 } /* Comment.Preproc */
 .c1 { color: #999; } /* Comment.Single */
 .cs { color: #999; } /* Comment.Special */
-.gd { background-color: #FFCCCC; border: 1px solid #CC0000 } /* Generic.Deleted */
+.gd { background-color: #fcc; border: 1px solid #c00 } /* Generic.Deleted */
 .ge { font-style: italic } /* Generic.Emph */
-.gr { color: #FF0000 } /* Generic.Error */
-.gh { color: #003300; } /* Generic.Heading */
-.gi { background-color: #CCFFCC; border: 1px solid #00CC00 } /* Generic.Inserted */
-.go { color: #AAAAAA } /* Generic.Output */
-.gp { color: #000099; } /* Generic.Prompt */
+.gr { color: #f00 } /* Generic.Error */
+.gh { color: #030; } /* Generic.Heading */
+.gi { background-color: #cfc; border: 1px solid #0c0 } /* Generic.Inserted */
+.go { color: #aaa } /* Generic.Output */
+.gp { color: #009; } /* Generic.Prompt */
 .gs { } /* Generic.Strong */
-.gu { color: #003300; } /* Generic.Subheading */
-.gt { color: #99CC66 } /* Generic.Traceback */
-.kc { color: #006699; } /* Keyword.Constant */
-.kd { color: #006699; } /* Keyword.Declaration */
-.kn { color: #006699; } /* Keyword.Namespace */
-.kp { color: #006699 } /* Keyword.Pseudo */
-.kr { color: #006699; } /* Keyword.Reserved */
-.kt { color: #007788; } /* Keyword.Type */
-.m { color: #FF6600 } /* Literal.Number */
+.gu { color: #030; } /* Generic.Subheading */
+.gt { color: #9c6 } /* Generic.Traceback */
+.kc { color: #069; } /* Keyword.Constant */
+.kd { color: #069; } /* Keyword.Declaration */
+.kn { color: #069; } /* Keyword.Namespace */
+.kp { color: #069 } /* Keyword.Pseudo */
+.kr { color: #069; } /* Keyword.Reserved */
+.kt { color: #078; } /* Keyword.Type */
+.m { color: #f60 } /* Literal.Number */
 .s { color: #d44950 } /* Literal.String */
 .na { color: #4f9fcf } /* Name.Attribute */
-.nb { color: #336666 } /* Name.Builtin */
-.nc { color: #00AA88; } /* Name.Class */
-.no { color: #336600 } /* Name.Constant */
-.nd { color: #9999FF } /* Name.Decorator */
-.ni { color: #999999; } /* Name.Entity */
-.ne { color: #CC0000; } /* Name.Exception */
-.nf { color: #CC00FF } /* Name.Function */
-.nl { color: #9999FF } /* Name.Label */
-.nn { color: #00CCFF; } /* Name.Namespace */
+.nb { color: #366 } /* Name.Builtin */
+.nc { color: #0a8; } /* Name.Class */
+.no { color: #360 } /* Name.Constant */
+.nd { color: #99f } /* Name.Decorator */
+.ni { color: #999; } /* Name.Entity */
+.ne { color: #c00; } /* Name.Exception */
+.nf { color: #c0f } /* Name.Function */
+.nl { color: #99f } /* Name.Label */
+.nn { color: #0cf; } /* Name.Namespace */
 .nt { color: #2f6f9f; } /* Name.Tag */
-.nv { color: #003333 } /* Name.Variable */
-.ow { color: #000000; } /* Operator.Word */
-.w { color: #bbbbbb } /* Text.Whitespace */
-.mf { color: #FF6600 } /* Literal.Number.Float */
-.mh { color: #FF6600 } /* Literal.Number.Hex */
-.mi { color: #FF6600 } /* Literal.Number.Integer */
-.mo { color: #FF6600 } /* Literal.Number.Oct */
-.sb { color: #CC3300 } /* Literal.String.Backtick */
-.sc { color: #CC3300 } /* Literal.String.Char */
-.sd { color: #CC3300; font-style: italic } /* Literal.String.Doc */
-.s2 { color: #CC3300 } /* Literal.String.Double */
-.se { color: #CC3300; } /* Literal.String.Escape */
-.sh { color: #CC3300 } /* Literal.String.Heredoc */
-.si { color: #AA0000 } /* Literal.String.Interpol */
-.sx { color: #CC3300 } /* Literal.String.Other */
-.sr { color: #33AAAA } /* Literal.String.Regex */
-.s1 { color: #CC3300 } /* Literal.String.Single */
-.ss { color: #FFCC33 } /* Literal.String.Symbol */
-.bp { color: #336666 } /* Name.Builtin.Pseudo */
-.vc { color: #003333 } /* Name.Variable.Class */
-.vg { color: #003333 } /* Name.Variable.Global */
-.vi { color: #003333 } /* Name.Variable.Instance */
-.il { color: #FF6600 } /* Literal.Number.Integer.Long */
+.nv { color: #033 } /* Name.Variable */
+.ow { color: #000; } /* Operator.Word */
+.w { color: #bbb } /* Text.Whitespace */
+.mf { color: #f60 } /* Literal.Number.Float */
+.mh { color: #f60 } /* Literal.Number.Hex */
+.mi { color: #f60 } /* Literal.Number.Integer */
+.mo { color: #f60 } /* Literal.Number.Oct */
+.sb { color: #c30 } /* Literal.String.Backtick */
+.sc { color: #c30 } /* Literal.String.Char */
+.sd { color: #c30; font-style: italic } /* Literal.String.Doc */
+.s2 { color: #c30 } /* Literal.String.Double */
+.se { color: #c30; } /* Literal.String.Escape */
+.sh { color: #c30 } /* Literal.String.Heredoc */
+.si { color: #a00 } /* Literal.String.Interpol */
+.sx { color: #c30 } /* Literal.String.Other */
+.sr { color: #3aa } /* Literal.String.Regex */
+.s1 { color: #c30 } /* Literal.String.Single */
+.ss { color: #fc3 } /* Literal.String.Symbol */
+.bp { color: #366 } /* Name.Builtin.Pseudo */
+.vc { color: #033 } /* Name.Variable.Class */
+.vg { color: #033 } /* Name.Variable.Global */
+.vi { color: #033 } /* Name.Variable.Instance */
+.il { color: #f60 } /* Literal.Number.Integer.Long */
 
 .css .o,
 .css .o + .nt,