Merge branch 'master' into gh-pages

diff --git a/README.md b/README.md
index 457adb9f93685b60bef789acff883b1b0f5f22b5..1e5626a00b8e70b0a55cdaec5fd70c12ab02e403 100644 (file)
--- a/README.md
+++ b/README.md
@@ -62,9 +62,14 @@ 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`.
+If you host your code on GitHub, you can use [GitHub Pages](https://pages.github.com) to host your project.
 
-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.
+1. Fork this repo and switch to the `gh-pages` branch.
+2a. If you're [using a custom domain name](https://help.github.com/articles/setting-up-a-custom-domain-with-github-pages), modify the `CNAME` file to point to your new domain.
+2b. If you're not using a custom domain name, **modify the `baseurl` in `_config.yml`** to point to your GitHub Pages URL. Example: for a repo at `github.com/username/poole`, use `http://username.github.io/poole/`. **Be sure to include the trailing slash.**
+3. Done! Head to your GitHub Pages URL or custom domain.
+
+No matter your production or hosting setup, be sure to verify the `baseurl` option file and `CNAME` settings. Not applying this correctly can mean broken styles on your site.
 
 
 ## Options

diff --git a/_includes/head.html b/_includes/head.html
index b8276783407d40b32bc5bc596cfc8a0f2b45160e..a63329a547ab689b68106d97267badb3efa60571 100644 (file)
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -18,7 +18,7 @@
   <link rel="stylesheet" href="{{ site.baseurl }}public/css/syntax.css">
 
   <!-- Icons -->
-  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.baseurl }}public/apple-touch-icon-144-precomposed.png">
+  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.baseurl }}public/apple-touch-icon-precomposed.png">
   <link rel="shortcut icon" href="{{ site.baseurl }}public/favicon.ico">
 
   <!-- RSS -->

diff --git a/public/apple-touch-icon-144-precomposed.png b/public/apple-touch-icon-144-precomposed.png
deleted file mode 100644 (file)
index 177bbae..0000000
Binary files a/public/apple-touch-icon-144-precomposed.png and /dev/null differ

diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png
new file mode 100644 (file)
index 0000000..ef9f26b
Binary files /dev/null and b/public/apple-touch-icon-precomposed.png differ

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