aboutsummaryrefslogtreecommitdiff
path: root/.themes
diff options
context:
space:
mode:
Diffstat (limited to '.themes')
-rw-r--r--.themes/classic/sass/base/_typography.scss10
-rw-r--r--.themes/classic/source/_includes/after_footer.html1
-rw-r--r--.themes/classic/source/_includes/article.html4
-rw-r--r--.themes/classic/source/_includes/asides/delicious.html2
-rw-r--r--.themes/classic/source/_includes/disqus.html8
-rw-r--r--.themes/classic/source/_includes/facebook_like.html8
-rw-r--r--.themes/classic/source/_includes/post/sharing.html3
-rw-r--r--.themes/classic/source/_layouts/page.html2
8 files changed, 29 insertions, 9 deletions
diff --git a/.themes/classic/sass/base/_typography.scss b/.themes/classic/sass/base/_typography.scss
index ef83065b..60556752 100644
--- a/.themes/classic/sass/base/_typography.scss
+++ b/.themes/classic/sass/base/_typography.scss
@@ -115,7 +115,8 @@ blockquote {
}
}
-.has-pullquote:before {
+.pullquote-right:before,
+.pullquote-left:before {
/* Reset metrics. */
padding: 0;
border: none;
@@ -134,6 +135,13 @@ blockquote {
font-size: 1.4em;
line-height: 1.45em;
}
+
+.pullquote-left:before {
+ /* Make left pullquotes align properly. */
+ float: left;
+ margin: .5em 1.5em 1em 0;
+}
+
/* @extend this to force long lines of continuous text to wrap */
.force-wrap {
white-space: -moz-pre-wrap;
diff --git a/.themes/classic/source/_includes/after_footer.html b/.themes/classic/source/_includes/after_footer.html
index 80a481eb..b17f5463 100644
--- a/.themes/classic/source/_includes/after_footer.html
+++ b/.themes/classic/source/_includes/after_footer.html
@@ -1,4 +1,5 @@
{% include disqus.html %}
+{% include facebook_like.html %}
{% include google_plus_one.html %}
{% include twitter_sharing.html %}
{% include google_analytics.html %}
diff --git a/.themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html
index 79e26528..9db07455 100644
--- a/.themes/classic/source/_includes/article.html
+++ b/.themes/classic/source/_includes/article.html
@@ -1,9 +1,9 @@
{% unless page.no_header %}
<header>
{% if index %}
- <h1 class="entry-title"><a href="{{ root_url }}{{ post.url }}">{{ post.title | titlecase }}</a></h1>
+ <h1 class="entry-title"><a href="{{ root_url }}{{ post.url }}">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h1>
{% else %}
- <h1 class="entry-title">{{ page.title | titlecase }}</h1>
+ <h1 class="entry-title">{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}</h1>
{% endif %}
{% unless page.meta == false %}
<p class="meta">
diff --git a/.themes/classic/source/_includes/asides/delicious.html b/.themes/classic/source/_includes/asides/delicious.html
index 8c75b822..115cdcbc 100644
--- a/.themes/classic/source/_includes/asides/delicious.html
+++ b/.themes/classic/source/_includes/asides/delicious.html
@@ -2,7 +2,7 @@
<section>
<h1>On Delicious</h1>
<div id="delicious"></div>
- <script type="text/javascript" src="http://feeds.delicious.com/v1/json/{{ site.delicious_user }}?count={{ site.delicious_count }}&amp;sort=date&amp;callback=renderDeliciousLinks"></script>
+ <script type="text/javascript" src="http://feeds.delicious.com/v2/json/{{ site.delicious_user }}?count={{ site.delicious_count }}&amp;sort=date&amp;callback=renderDeliciousLinks"></script>
<p><a href="http://delicious.com/{{ site.delicious_user }}">My Delicious Bookmarks &raquo;</a></p>
</section>
{% endif %} \ No newline at end of file
diff --git a/.themes/classic/source/_includes/disqus.html b/.themes/classic/source/_includes/disqus.html
index 4b913534..a58512b5 100644
--- a/.themes/classic/source/_includes/disqus.html
+++ b/.themes/classic/source/_includes/disqus.html
@@ -1,19 +1,19 @@
{% comment %} Load script if disquss comments are enabled and `page.comments` is either empty (index) or set to true {% endcomment %}
{% if site.disqus_short_name and page.comments != false %}
<script type="text/javascript">
- (function () {
+
var disqus_shortname = '{{ site.disqus_short_name }}';
{% if page.comments == true %}
{% comment %} `page.comments` can be only be set to true on pages/posts, so we embed the comments here. {% endcomment %}
// var disqus_developer = 1;
var disqus_identifier = '{{ site.url }}{{ page.url }}';
var disqus_url = '{{ site.url }}{{ page.url }}';
- var disqus_script = 'embed.js'
+ var disqus_script = 'embed.js';
{% else %}
{% comment %} As `page.comments` is empty, we must be on the index page. {% endcomment %}
- var disqus_script = 'count.js'
+ var disqus_script = 'count.js';
{% endif %}
-
+ (function () {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
dsq.src = 'http://' + disqus_shortname + '.disqus.com/' + disqus_script;
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
diff --git a/.themes/classic/source/_includes/facebook_like.html b/.themes/classic/source/_includes/facebook_like.html
new file mode 100644
index 00000000..6c4c2788
--- /dev/null
+++ b/.themes/classic/source/_includes/facebook_like.html
@@ -0,0 +1,8 @@
+<div id="fb-root"></div>
+<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.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/post/sharing.html b/.themes/classic/source/_includes/post/sharing.html
index f0f9b9db..e32500d0 100644
--- a/.themes/classic/source/_includes/post/sharing.html
+++ b/.themes/classic/source/_includes/post/sharing.html
@@ -5,4 +5,7 @@
{% if site.google_plus_one %}
<div class="g-plusone" data-size="{{ site.google_plus_one_size }}"></div>
{% endif %}
+ {% if site.facebook_like %}
+ <div class="fb-like" data-send="true" data-width="450" data-show-faces="false"></div>
+ {% endif %}
</div>
diff --git a/.themes/classic/source/_layouts/page.html b/.themes/classic/source/_layouts/page.html
index 4edd3ed5..8ba6ec94 100644
--- a/.themes/classic/source/_layouts/page.html
+++ b/.themes/classic/source/_layouts/page.html
@@ -6,7 +6,7 @@ layout: default
<article role="article">
{% if page.title %}
<header>
- <h1 class="entry-title">{{ page.title | titlecase }}</h1>
+ <h1 class="entry-title">{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}</h1>
{% if page.date %}<p class="meta">{% include post/date.html %}{{ time }}</p>{% endif %}
</header>
{% endif %}