Merge pull request #1 from daattali/master

merge updates from Dean

README.md

@@ -148,8 +148,6 @@ To set up a GitHub Project page, simply fork this repository into a branch calle
 
 I wrote [a blog post](http://deanattali.com/2015/03/12/beautiful-jekyll-how-to-build-a-site-in-minutes/) describing some more advanced features that I used in my website that are applicable to any Jekyll site.  It describes how I used a custom URL for my site (deanattali.com instead of daattali.github.io), how to add a Google-powered search into your site, and provides a few more details about having an RSS feed. 
 
-Additionally, if you choose to deploy Jekyll on your own server (such as a DigitalOcean server), you can tell Jekyll to automatically categorize your blog posts by tags. You just need to set `link-tags: true` in `_config.yml`. Jekyll will then generate a new page for each unique tag which lists all of the posts that belong to that tag.
-
 ### Featured users (success stories!)
 
 To my huge surprise, Beautiful Jekyll has been used in over 500 websites in its first 6 months alone! Here is a hand-picked selection of some websites that use Beautiful Jekyll.
@@ -188,7 +186,7 @@ Want your website featured here? [Contact me](http://deanattali.com/aboutme#cont
 
 ### Very advanced: Local development
 
-Beautiful Jekyll is meant to be so simple to use that you can do it all within the browser. However, if you'd like to develop locally on your own machine, that's possible too if you're comfortable with command line. Folow these simple steps to do that with Vagrant:
+Beautiful Jekyll is meant to be so simple to use that you can do it all within the browser. However, if you'd like to develop locally on your own machine, that's possible too if you're comfortable with command line. Follow these simple steps to do that with Vagrant:
 
 1. Install [VirtualBox](http://virtualbox.org) and [Vagrant](https://www.vagrantup.com)
 2. Clone your fork `git clone git@github.com:yourusername/yourusername.github.io.git`
@@ -198,6 +196,8 @@ Beautiful Jekyll is meant to be so simple to use that you can do it all within t
 
 Disclaimer: I personally am NOT using local development so I don't know much about running Jekyll locally. If you follow this route, please don't ask me questions because unfortunately I honestly won't be able to help!
 
+Additionally, if you choose to deploy Jekyll using a local ruby installation, you can tell Jekyll to automatically categorize your blog posts by tags. You just need to set `link-tags: true` in `_config.yml`. Jekyll will then generate a new page for each unique tag which lists all of the posts that belong to that tag.
+
 ### Credits
 
 This template was not made entirely from scratch. I would like to give special thanks to:

_config.yml

@@ -97,7 +97,7 @@ defaults:
       layout: "page"
       show-avatar: true
 
-# Tags (not recommended if you are deploying via GitHub pages, see README.md)
+# Use tags pages (not recommended if you are deploying via GitHub pages, only set to true if deploying locally with ruby)
 link-tags: false
 
 # Exclude these files from production site

_layouts/post.html

@@ -8,7 +8,9 @@ layout: base
   <div class="row">
     <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
       <article role="main" class="blog-post">
-        {% if page.tags.size > 0 %}
+        {{ content }}
+      </article>
+      {% if page.tags.size > 0 %}
         <div class="blog-tags">
           Tags: 
           {% if site.link-tags %}
@@ -19,10 +21,7 @@ layout: base
             {{ page.tags | join: ", " }}
           {% endif %}
         </div>
-        {% endif %}
+      {% endif %}
-        {{ content }}
-	    </article>
-	  	  
       <ul class="pager blog-pager">
         {% if page.previous.url %}
         <li class="previous">

css/main.css

@@ -337,7 +337,7 @@ footer .theme-by {
   font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
   color: #999;
   font-size: 15px;
-  padding-top: 5px;
+  margin-bottom: 30px;
 }
 
 .blog-tags a {
@@ -347,16 +347,22 @@ footer .theme-by {
 }
 
 .blog-tags a:hover {
-  -moz-border-radius-topleft: 2px;
+  border-radius: 2px;
-  -moz-border-radius-topright: 2px;
-  -moz-border-radius-bottomright: 2px;
-  -moz-border-radius-bottomleft: 2px;
-  -webkit-border-radius: 2px 2px 2px 2px;
-  border-radius: 2px 2px 2px 2px;
   color: #008AFF;
   background-color: #CCC;
 }
 
+.post-preview .blog-tags {
+  margin-top: 5px;
+  margin-bottom: 0;
+}
+
+@media only screen and (min-width: 768px) {
+  .post-preview .blog-tags {
+    margin-top: 10px;
+  }
+}
+
 /* --- Post and page headers --- */
 
 .intro-header {
@@ -578,3 +584,20 @@ table tr th :last-child,
 table tr td :last-child {
   margin-bottom: 0;
 }
+
+/* --- Code blocks --- */
+
+pre {
+  font-size: 16px;
+  line-height: 1.5em;
+  background: #FAFAFA;
+  background-image: linear-gradient(#FAFAFA 50%, #FDFDFD 50%);
+  background-position: 0px 10px;
+  background-repeat: repeat;
+  background-size: 3em 3em;
+  border-left: 7px solid #444;
+}
+
+pre code {
+  white-space: pre;
+}

css/pygment_highlights.css

@@ -1,4 +1,4 @@
-.highlight  { background: #ffffff; }
+/* .highlight  { background: #ffffff; } Dean commented out */
 .highlight pre { background-color: #fff; font-size: 16px }
 .highlight .c { color: #999988; font-style: italic } /* Comment */
 .highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */