Merge branch 'master' of github.com:imathis/octopress into linklog

.themes/classic/sass/base/_layout.scss

@@ -89,7 +89,10 @@ body {
   }
 }
 
-#content { > div, > article { width: 100%; }}
+#content {
+  overflow: hidden;
+  > div, > article { width: 100%; }
+}
 
 aside.sidebar {
   float: none;
@@ -134,6 +137,7 @@ body.sidebar-footer {
   }
   #content {
     @extend .group;
+    overflow: visible;
     margin-right: $sidebar-width-medium;
     position: relative;
     .no-sidebar & { margin-right: 0; border-right: 0; }

.themes/classic/sass/partials/_sharing.scss

@@ -4,3 +4,5 @@
     background: $img-border top left repeat-x;
   }
 }
+
+#fb-root { display: none; }

.themes/classic/sass/partials/sidebar/_base.scss

@@ -2,6 +2,7 @@
   @include box-shadow(lighten($sidebar-bg, 5) 0 1px);
 }
 aside.sidebar {
+  overflow: hidden;
   color: $sidebar-color;
   text-shadow: lighten($sidebar-bg, 8) 0 1px;
   a { @extend .force-wrap; }

.themes/classic/source/_includes/asides/github.html

@@ -1,11 +1,11 @@
 {% if site.github_user %}
 <section>
-  <h1>Github Repos</h1>
+  <h1>GitHub Repos</h1>
   <ul id="gh_repos">
     <li class="loading">Status updating...</li>
   </ul>
   {% if site.github_show_profile_link %}
-  <a href="https://github.com/{{site.github_user}}">@{{site.github_user}}</a> on Github
+  <a href="https://github.com/{{site.github_user}}">@{{site.github_user}}</a> on GitHub
   {% endif %}
   <script type="text/javascript">
     $.domReady(function(){

.themes/classic/source/_layouts/post.html

@@ -21,7 +21,7 @@ single: true
         <a class="basic-alignment left" href="{{page.previous.url}}" title="Previous Post: {{page.previous.title}}">&laquo; {{page.previous.title}}</a>
       {% endif %}
       {% if page.next.url %}
-        <a class="basic-alignment right" href="{{page.next.url}}" title="next Post: {{page.next.title}}">{{page.next.title}} &raquo;</a>
+        <a class="basic-alignment right" href="{{page.next.url}}" title="Next Post: {{page.next.title}}">{{page.next.title}} &raquo;</a>
       {% endif %}
     </p>
   </footer>

.themes/classic/source/javascripts/octopress.js

@@ -110,7 +110,7 @@ function wrapFlashVideos() {
 function renderDeliciousLinks(items) {
   var output = "<ul>";
   for (var i=0,l=items.length; i<l; i++) {
-    output += '<li><a href="' + items[i].u + '" title="Tags: ' + items[i].t.join(', ') + '">' + items[i].d + '</a></li>';
+    output += '<li><a href="' + items[i].u + '" title="Tags: ' + (items[i].t == "" ? "" : items[i].t.join(', ')) + '">' + items[i].d + '</a></li>';
   }
   output += "</ul>";
   $('#delicious').html(output);

_config.yml

@@ -48,7 +48,7 @@ linklog_marker_position: after
 linklog_marker_position_feed: after
 standard_post_marker:
 
-titlecase: true       # Converts page and post titles to tilecase
+titlecase: true       # Converts page and post titles to titlecase
 
 # list each of the sidebar modules you want to include, in the order you want them to appear.
 # To add custom asides, create files in /source/_includes/custom/asides/ and add them to the list like 'custom/asides/custom_aside_name.html'