aboutsummaryrefslogtreecommitdiff
path: root/.themes/classic/source
diff options
context:
space:
mode:
authorParker Moore <parkrmoore@gmail.com>2013-03-06 01:29:52 +0100
committerParker Moore <parkrmoore@gmail.com>2013-03-06 01:29:52 +0100
commitcf5e90962627c4ce2ea5b08d452496621eb969e3 (patch)
tree99a75c8e4f7c5155995236fed0352b94863ef1f1 /.themes/classic/source
parent3548752af0e5afc8ca524740a261e50532bbc9dd (diff)
parent16c18e41913ec8e37dc7b5c8de8d3d4484c477b4 (diff)
downloadmy_new_personal_website-cf5e90962627c4ce2ea5b08d452496621eb969e3.tar.xz
my_new_personal_website-cf5e90962627c4ce2ea5b08d452496621eb969e3.zip
Merge branch 'master' of github.com:imathis/octopress
* 'master' of github.com:imathis/octopress: Update plugins/pygments_code.rb Async load of Facebook JS Update plugins/pygments_code.rb Upgrade ruby version optimized order of styles and scripts in header Added stringex and changed to use #to_url for create directory. To don't receive error in url to accented characters.
Diffstat (limited to '.themes/classic/source')
-rw-r--r--.themes/classic/source/_includes/facebook_like.html2
-rw-r--r--.themes/classic/source/_includes/head.html4
2 files changed, 3 insertions, 3 deletions
diff --git a/.themes/classic/source/_includes/facebook_like.html b/.themes/classic/source/_includes/facebook_like.html
index 74f91307..d263e6d2 100644
--- a/.themes/classic/source/_includes/facebook_like.html
+++ b/.themes/classic/source/_includes/facebook_like.html
@@ -3,7 +3,7 @@
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) {return;}
- js = d.createElement(s); js.id = id;
+ js = d.createElement(s); js.id = id; js.async = true;
js.src = "//connect.facebook.net/en_US/all.js#appId=212934732101925&xfbml=1";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
diff --git a/.themes/classic/source/_includes/head.html b/.themes/classic/source/_includes/head.html
index 75c76ccc..8de6679f 100644
--- a/.themes/classic/source/_includes/head.html
+++ b/.themes/classic/source/_includes/head.html
@@ -20,10 +20,10 @@
<link rel="canonical" href="{{ canonical }}">
<link href="{{ root_url }}/favicon.png" rel="icon">
<link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
+ <link href="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml">
+ {% include custom/head.html %}
<script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script>
<script src="{{ root_url }}/javascripts/ender.js"></script>
<script src="{{ root_url }}/javascripts/octopress.js" type="text/javascript"></script>
- <link href="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml">
- {% include custom/head.html %}
{% include google_analytics.html %}
</head>