From d187d55a7e754e8822434f8b5b67c9c1bc6ec8e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 7 Sep 2013 00:15:18 +0200 Subject: [PATCH] upgrade slash theme --- sass/parts/_archive.scss | 29 ++++++++++--------- sass/parts/_header.scss | 15 +++++++--- sass/parts/_syntax.scss | 5 ++-- source/_includes/archive_post.html | 5 +++- source/_includes/article.html | 4 +-- source/_includes/disqus.html | 2 +- source/_includes/head.html | 6 ++-- source/_includes/header.html | 3 ++ source/_includes/post/sharing.html | 31 ++++++++++++--------- source/blog/archives/index.html | 8 ++++++ source/images/fancybox/fancybox_sprite.png | Bin 2277 -> 2171 bytes source/images/loading_gray.gif | Bin 8787 -> 7509 bytes source/images/loading_pacman.gif | Bin 1928 -> 881 bytes source/images/social/coderwall.png | Bin 2983 -> 452 bytes source/images/social/delicious.png | Bin 1064 -> 365 bytes source/images/social/facebook.png | Bin 1107 -> 426 bytes source/images/social/github.png | Bin 1205 -> 581 bytes source/images/social/google.png | Bin 1223 -> 602 bytes source/images/social/instagram.png | Bin 0 -> 556 bytes source/images/social/linkedin.png | Bin 1371 -> 383 bytes source/images/social/pinboard.png | Bin 445 -> 579 bytes source/images/social/pinterest.png | Bin 1128 -> 704 bytes source/images/social/rss.png | Bin 1250 -> 619 bytes source/images/social/twitter.png | Bin 1073 -> 554 bytes 24 files changed, 69 insertions(+), 39 deletions(-) create mode 100644 source/blog/archives/index.html create mode 100644 source/images/social/instagram.png diff --git a/sass/parts/_archive.scss b/sass/parts/_archive.scss index af8f764..81c7789 100644 --- a/sass/parts/_archive.scss +++ b/sass/parts/_archive.scss @@ -42,27 +42,30 @@ margin-bottom: 0; } .meta{ - color: $color-gray02; - font-size: 0.9em; line-height: 2; + font-size: 0.9em; + color: $color-gray02; margin-top: 15px; @media screen and (max-width: 600px){ display: none; } - span{ - margin-right: 30px; - @include inline-block; + a{ + @include link-colors($color-gray02, $color-gray01); + @include transition(0.3s); + } + .date, .tags, .comments{ + padding-left: 30px; + position: relative; &:before{ color: $color-gray03; font: 1.3em $font-icon; - padding-right: 10px; + line-height: 1.6em; + position: absolute; + left: 0; } - } - a{ - color: $color-gray02; - @include transition(0.3s); - &:hover{ - color: $color-gray01; + @media screen and (max-width: 600px){ + @include inline-block; + margin-right: 30px; } } .date:before{content: "\f073";} @@ -70,4 +73,4 @@ .comments:before{content: "\f075";} } } -} \ No newline at end of file +} diff --git a/sass/parts/_header.scss b/sass/parts/_header.scss index 50ece11..972a0b7 100644 --- a/sass/parts/_header.scss +++ b/sass/parts/_header.scss @@ -375,7 +375,7 @@ $header-height: 30px; &:hover{ border: 1px solid darken(rgb(190,64,55), 10%); } - } + } &.delicious{ background: image-url('social/delicious.png') center no-repeat rgb(50,113,203); border: 1px solid rgb(50,113,203); @@ -384,10 +384,17 @@ $header-height: 30px; } } &.rss{ - background: image-url('social/rss.png') center no-repeat #EF7522; - border: 1px solid #EF7522; + background: image-url('social/rss.png') center no-repeat #ef7522; + border: 1px solid #ef7522; &:hover{ - border: 1px solid darken(#EF7522, 10%); + border: 1px solid darken(#ef7522, 10%); + } + } + &.instagram{ + background: image-url('social/instagram.png') center no-repeat rgb(64,110,149); + border: 1px solid rgb(64,110,149); + &:hover{ + border: 1px solid darken(rgb(64,110,149), 10%); } } } diff --git a/sass/parts/_syntax.scss b/sass/parts/_syntax.scss index 0a95988..9f320aa 100644 --- a/sass/parts/_syntax.scss +++ b/sass/parts/_syntax.scss @@ -139,8 +139,9 @@ figure.code{ background: none; border: none; pre{ - font: 0.9em $font-mono; - line-height: 1.5; + font: $font-mono; + line-height: inherit; + text-align: left; } } .gist-meta{ diff --git a/source/_includes/archive_post.html b/source/_includes/archive_post.html index 04d4d5f..ea42883 100644 --- a/source/_includes/archive_post.html +++ b/source/_includes/archive_post.html @@ -6,6 +6,9 @@ {% endunless %}

{{ date | date: "%Y" }}

+ {% if forloop.last %} +
+ {% endif %} {% endunless %}

{{post.title}}

@@ -16,4 +19,4 @@ {% endif %} -
\ No newline at end of file + diff --git a/source/_includes/article.html b/source/_includes/article.html index 0ccc013..19f50e5 100644 --- a/source/_includes/article.html +++ b/source/_includes/article.html @@ -21,6 +21,6 @@
{% include post/date.html %}{{ time }}
{% include post/categories.html %}
{% if site.disqus_short_name and site.disqus_show_comment_count == true %} -
Comments
+
Comments
{% endif %} - \ No newline at end of file + diff --git a/source/_includes/disqus.html b/source/_includes/disqus.html index eb30877..10565e8 100644 --- a/source/_includes/disqus.html +++ b/source/_includes/disqus.html @@ -14,7 +14,7 @@ {% endif %} (function () { var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; - dsq.src = 'http://' + disqus_shortname + '.disqus.com/' + disqus_script; + dsq.src = '//go.disqus.com/' + disqus_script; (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); }()); diff --git a/source/_includes/head.html b/source/_includes/head.html index 2adee9f..8dd9433 100644 --- a/source/_includes/head.html +++ b/source/_includes/head.html @@ -2,7 +2,7 @@ - {% if page.title %}{{ page.title }} - {% endif %}{{ site.title }} + {% if page.title %}{{ page.title | strip_html }} - {% endif %}{{ site.title }} {% capture description %}{% if page.description %}{{ page.description }}{% else %}{{ content | raw_content }}{% endif %}{% endcapture %} @@ -15,6 +15,6 @@ - + {% include custom/head.html %} - \ No newline at end of file + diff --git a/source/_includes/header.html b/source/_includes/header.html index 5fb456a..9d955b9 100644 --- a/source/_includes/header.html +++ b/source/_includes/header.html @@ -47,6 +47,9 @@ {% if site.subscribe_rss %} RSS {% endif %} + {% if site.instagram_user %} + Instagram + {% endif %}