Merged from upstream

kaworu · Jul 22, 2014 · 1e44693 · 1e44693
1 parent 6f9cce7
commit 1e44693
Show file tree

Hide file tree

Showing 239 changed files with 3,259 additions and 40,438 deletions.
diff --git a/sass/custom/_syntax.scss b/sass/custom/_syntax.scss
@@ -9,9 +9,6 @@ body {
             pre {
                 white-space: pre;
             }
-            .gutter {
-                display: none;
-            }
         }
     }
 }
diff --git a/sass/partials/_header.scss b/sass/partials/_header.scss
@@ -1,6 +1,10 @@
-header[role=banner] {
+header[role=banner] .navbar {
     /* fix email / rss icon for bootstrap navbar */
-    .navbar-default .navbar-nav > li img {
+    li img {
         height: 18px;
     }
+    a.subscribe-rss, a.subscribe-email {
+        padding-top: 0.9em;
+        padding-bottom: 0.9em;
+    }
 }
diff --git a/sass/partials/_syntax.scss b/sass/partials/_syntax.scss
@@ -11,7 +11,6 @@ figcaption + .highlight {
 }
 
 .highlight .line-numbers, .gist-file .line-numbers {
-  display: none; // XXX
   text-align: right;
   font-size: 13px;
   line-height: 1.45em;
@@ -27,7 +26,7 @@ figcaption + .highlight {
     text-shadow: darken($base02, 10) 0 -1px;
   }
   span { color: $base01 !important; }
-  padding: .8em !important;
+  padding: 1em .8em .8em .8em !important;
   @include border-radius(0);
 }
 
@@ -269,7 +268,7 @@ figure.code:not(.panel), .gist {
         @include border-radius(5px);
         span, a[href*='#file'] {
             font-size: 16px;
-            line-height: 1.1;
+            line-height: 1.45em;
             font-weight: bold;
         }
     }

diff --git a/source/_includes/after_footer.html b/source/_includes/after_footer.html
@@ -1,5 +1,3 @@
-<script src="{{ root_url }}/assets/bootstrap/dist/js/bootstrap.min.js"></script>
-<script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script>
 {% include disqus.html %}
 {% include facebook_like.html %}
 {% include google_plus_one.html %}

diff --git a/source/_includes/archive_post.html b/source/_includes/archive_post.html
@@ -1,5 +1,5 @@
 {% capture category %}{{ post.categories | size }}{% endcapture %}
-<h1 itemprop="name headline"><a href="{{ root_url }}{{ post.url }}" itemprop="url">{{post.title}}</a></h1>
+<h1 itemprop="name headline"><a href="{{ root_url }}{{ post.url }}" itemprop="url">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h1>
 <p class="meta text-muted">
   {% include post/date.html %}{{ time }}
   {% include post/categories.html %}

diff --git a/source/_includes/custom/after_footer.html b/source/_includes/custom/after_footer.html
@@ -1,3 +1,2 @@
-{% comment %}
-  Add content to be output at the bottom of each page. (You might use this for analytics scripts, for example)
-{% endcomment %}
+<script src="{{ root_url }}/assets/bootstrap/dist/js/bootstrap.min.js"></script>
+<script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script>
diff --git a/source/_includes/custom/category_feed.xml b/source/_includes/custom/category_feed.xml
@@ -4,7 +4,7 @@ layout: nil
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
 
-  <title><![CDATA[{{ page.title }} | {{ site.title }}]]></title>
+  <title><![CDATA[{% if site.titlecase %}{{ page.title | titlecase | cdata_escape }}{% else %}{{ page.title | cdata_escape }}{% endif %} | {{ site.title | cdata_escape }}]]></title>
   <link href="{{ site.url }}/{{ page.feed_url }}" rel="self"/>
   <link href="{{ site.url }}/"/>
   <updated>{{ site.time | date_to_xmlschema }}</updated>
@@ -17,7 +17,7 @@ layout: nil
 
   {% for post in site.categories[page.category] limit: 5 %}
   <entry>
-    <title type="html"><![CDATA[{{ post.title | cdata_escape }}]]></title>
+    <title type="html"><![CDATA[{% if site.titlecase %}{{ post.title | titlecase | cdata_escape }}{% else %}{{ post.title | cdata_escape }}{% endif %}]]></title>
     <link href="{{ site.url }}{{ post.url }}"/>
     <updated>{{ post.date | date_to_xmlschema }}</updated>
     <id>{{ site.url }}{{ post.id }}</id>

diff --git a/source/_includes/custom/head.html b/source/_includes/custom/head.html
@@ -1,3 +1,4 @@
+<script src="{{ root_url }}/javascripts/libs/jquery/jquery-2.0.3.min.js"></script>
+
 <link href="{{ root_url }}/assets/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" type="text/css">
 <link href="{{ root_url }}/assets/bootstrap/dist/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">
-<link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
diff --git a/source/_includes/head.html b/source/_includes/head.html
@@ -1,10 +1,8 @@
 <!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="no-js iem7"><![endif]-->
-<!--[if lt IE 9]><html class="no-js lte-ie8"><![endif]-->
-<!--[if (gt IE 8)|(gt IEMobile 7)|!(IEMobile)|!(IE)]><!--><html class="no-js" lang="en"><!--<![endif]-->
+<html class="no-js" lang="en">
 <head>
   <meta charset="utf-8">
-  <title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title>
+  <title>{% if page.title %}{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %} - {% endif %}{{ site.title }}</title>
   <meta name="author" content="{{ site.author }}">
 
   {% if page.description %}<meta name="description" content="{{ page.description | strip_html | condense_spaces | truncate:150 }}">{% endif %}
@@ -22,6 +20,10 @@
 
   {% include custom/head.html %}
 
-  <script src="{{ root_url }}/javascripts/libs/jquery/jquery-2.0.3.min.js"></script>
+  {% comment %}
+    screen.css is included after custom/head so it can override stuff like Bootstrap fonts etc.
+  {% endcomment %}
+  <link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
+
   {% include google_analytics.html %}
 </head>
diff --git a/source/assets/bootstrap/.editorconfig b/source/assets/bootstrap/.editorconfig
diff --git a/source/assets/bootstrap/.gitattributes b/source/assets/bootstrap/.gitattributes
diff --git a/source/assets/bootstrap/.gitignore b/source/assets/bootstrap/.gitignore
diff --git a/source/assets/bootstrap/.travis.yml b/source/assets/bootstrap/.travis.yml
diff --git a/source/assets/bootstrap/CNAME b/source/assets/bootstrap/CNAME