Merge branch 'pr/13'

diff --git a/404.html b/404.html
index 41190842d89b43e2cb0cc8805d3baf77e5583d18..9703ba819b75698f1260c1c97b3c81356f38cb96 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/README.md b/README.md
index c0bff196000f09ff0bc5b8bf4c93850ef9c4ccc3..e11acd9da15222ed61c62bbec9b2b9231698d0ed 100644 (file)
--- a/README.md
+++ b/README.md
@@ -77,7 +77,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 74cf4860002fd5ac75ceadc3314565827baf0391..857983f0e676eeb49e1de5edd0cd3de50b339775 100644 (file)
--- a/_config.yml
+++ b/_config.yml
@@ -7,12 +7,12 @@ 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'
+  name:           Mark Otto
   url:            https://twitter.com/mdo
 
 paginate:         1

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-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/public/css/poole.css b/public/css/poole.css
index 49309a1ab3f9b66de3d8d78ab4daee19414a1ec2..814218995cbacb932b6f79404a2114e8c8470d6d 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;
   }
@@ -217,7 +217,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 +406,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,