Merge branch 'master' into gh-pages

diff --git a/404.html b/404.html
index 5f5b9bfecefa2c0278fd0434ad2f755ada70522e..d05ddb0abb07e050413ef2440f41fdea1be9371b 100644 (file)
--- a/404.html
+++ b/404.html
@@ -1,6 +1,7 @@
 ---
 layout: default
 title: "404: Page not found"
+permalink: 404.html
 ---
 
 <div class="page">

diff --git a/CNAME b/CNAME
deleted file mode 100644 (file)
index 3a9ff84..0000000
--- a/CNAME
+++ /dev/null
@@ -1 +0,0 @@
-demo.getpoole.com
\ No newline at end of file

diff --git a/_config.yml b/_config.yml
index 74cf4860002fd5ac75ceadc3314565827baf0391..c0f0356af4f13f83296ae224b8d3a90fd775f758 100644 (file)
--- a/_config.yml
+++ b/_config.yml
@@ -7,13 +7,13 @@ permalink:        pretty
 
 # Setup
 title:            Poole
-tagline:          'The Jekyll Butler'
-description:      'Base theme for Jekyll themes by @mdo.'
+tagline:          The Jekyll Butler
+description:      Base theme for Jekyll themes by @mdo.
 url:              http://getpoole.com
 
 author:
-  name:           'Mark Otto'
-  url:            https://twitter.com/mdo
+  name:           Mark Otto
+   url:           https://twitter.com/mdo
 
 paginate:         1
 

diff --git a/_includes/head.html b/_includes/head.html
index 662eb11bc0203838f46f360d6678495b5646f86c..3388fceef4846077c46988d44f3616dec4378929 100644 (file)
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -6,10 +6,10 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
 
   <title>
-    {% if page.title %}
-      {{ page.title }} &middot; {{ site.title }}
-    {% else %}
+    {% if page.title == "Home" %}
       {{ site.title }} &middot; {{ site.tagline }}
+    {% else %}
+      {{ page.title }} &middot; {{ site.title }}
     {% endif %}
   </title>
 

diff --git a/_posts/2013-12-31-whats-jekyll.md b/_posts/2013-12-31-whats-jekyll.md
index a6d28b5921246a47a9c1ebea3e2278202e3bbdd9..c102e15c083e2d441c3eafe4ad08cac69f5eca73 100644 (file)
--- a/_posts/2013-12-31-whats-jekyll.md
+++ b/_posts/2013-12-31-whats-jekyll.md
@@ -3,10 +3,10 @@ layout: post
 title: What's Jekyll?\r
 ---\r
 \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/mojombo/jekyll/blob/master/README.markdown):\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
 \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/mojombo/jekyll).
\ No newline at end of file
+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 81e474879a34cd391c9a9387c9d234eb7bfb5f8d..340d14af667fdc136ae960f3a89bc1ccb55a6bb6 100644 (file)
--- a/_posts/2014-01-01-example-content.md
+++ b/_posts/2014-01-01-example-content.md
@@ -48,6 +48,14 @@ adder(2, 6);
 \r
 Aenean lacinia bibendum nulla sed consectetur. Etiam porta sem malesuada magna mollis euismod. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa.\r
 \r
+### Gists via GitHub Pages\r
+\r
+Vestibulum id ligula porta felis euismod semper. Nullam quis risus eget urna mollis ornare vel eu leo. Donec sed odio dui.\r
+\r
+{% gist 5555251 gist.md %}\r
+\r
+Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec sed odio dui. Vestibulum id ligula porta felis euismod semper.\r
+\r
 ### Lists\r
 \r
 Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean lacinia bibendum nulla sed consectetur. Etiam porta sem malesuada magna mollis euismod. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.\r

diff --git a/_posts/2014-01-02-introducing-poole.md b/_posts/2014-01-02-introducing-poole.md
index fdfbba73070289b2397ba6dcd9aa3aebe6dc0735..84f5ed5282e434d7353ddeb681088c0608cffef6 100644 (file)
--- a/_posts/2014-01-02-introducing-poole.md
+++ b/_posts/2014-01-02-introducing-poole.md
@@ -20,7 +20,7 @@ Learn more and contribute on [GitHub](https://github.com/poole).
 \r
 Poole is a streamlined Jekyll site designed and built as a foundation for building more meaningful themes. Poole, and every theme built on it, includes the following:\r
 \r
-* Complete Jekyll setup included (layouts, config, [404](/404), [RSS feed](/atom.xml), posts, and [example page](/about))\r
+* Complete Jekyll setup included (layouts, config, [404](/404.html), [RSS feed](/atom.xml), posts, and [example page](/about))\r
 * Mobile friendly design and development\r
 * Easily scalable text and component sizing with `rem` units in the CSS\r
 * Support for a wide gamut of HTML elements\r

diff --git a/about.md b/about.md
index bd0024f309bb70e2420199a3c10a5eb0a8500a6b..9b2605bb4cee862adc590665b04bea875a7473bd 100644 (file)
--- a/about.md
+++ b/about.md
@@ -22,9 +22,9 @@ Some fun facts about the setup of this project include:
 
 * Built for [Jekyll](http://jekyllrb.com)
 * Developed on GitHub and hosted for free on [GitHub Pages](https://pages.github.com)
-* Coded with [Sublime Text 2](http://sublimetext.org), an amazing code editor
+* Coded with [Sublime Text 2](http://sublimetext.com), an amazing code editor
 * Designed and developed while listening to music like [Blood Bros Trilogy](https://soundcloud.com/maddecent/sets/blood-bros-series)
 
 Have questions or suggestions? Feel free to [open an issue on GitHub](https://github.com/poole/issues/new) or [ask me on Twitter](https://twitter.com/mdo).
 
-Thanks for reading!
\ No newline at end of file
+Thanks for reading!

diff --git a/public/css/poole.css b/public/css/poole.css
index 5e3dabe9f60cf22a4d72717da2d501f393fe0a8e..49309a1ab3f9b66de3d8d78ab4daee19414a1ec2 100644 (file)
--- a/public/css/poole.css
+++ b/public/css/poole.css
@@ -175,6 +175,8 @@ pre code {
   color: inherit;
   background-color: transparent;
 }
+
+/* Pygments via Jekyll */
 .highlight {
   margin-bottom: 1rem;
   border-radius: 4px;
@@ -183,6 +185,28 @@ pre code {
   margin-bottom: 0;
 }
 
+/* Gist via GitHub Pages */
+.gist .gist-file {
+  font-family: Menlo, Monaco, "Courier New", monospace !important;
+}
+.gist .markdown-body {
+  padding: 15px;
+}
+.gist pre {
+  padding: 0;
+  background-color: transparent;
+}
+.gist .gist-file .gist-data {
+  font-size: .8rem !important;
+  line-height: 1.4;
+}
+.gist code {
+  padding: 0;
+  color: inherit;
+  background-color: transparent;
+  border-radius: 0;
+}
+
 /* Quotes */
 blockquote {
   padding: .5rem 1rem;
@@ -202,6 +226,7 @@ blockquote p:last-child {
 
 img {
   display: block;
+  max-width: 100%;
   margin: 0 0 1rem;
   border-radius: 5px;
 }