diff --git a/.themes/classic/sass/partials/_sharing.scss b/.themes/classic/sass/partials/_sharing.scss index e6a220a..0f8a4ac 100644 --- a/.themes/classic/sass/partials/_sharing.scss +++ b/.themes/classic/sass/partials/_sharing.scss @@ -1,22 +1,47 @@ -@mixin social-button-bg($img, $color: #444) { +@import "icon/*.png";/**/ +@include all-icon-sprites($dimensions: true); + +@mixin social-button-bg($icon: false, $color: #333, $img: false) { color: $color; &:visited, &:hover, &:visited:hover { color: $color; } - position: relative; - padding-left: image-width($img) + 6px; - &:before { - content: ""; - background: image-url($img) no-repeat center center; - width: image-width($img); - height: image-height($img); - display: inline-block; - position: absolute; left: 3px; - top: 3px; + @if $img { + padding-left: image-width($img) + 6px; + &:before { + background: image-url($img) no-repeat center center; + width: image-width($img); + height: image-height($img); + position: absolute; left: 3px; + top: 3px; + } + } @else if $icon { + padding-left: icon-sprite-width($icon) + 6px; + &:before { + vertical-align: middle; + @extend .icon-#{$icon}; + position: absolute; left: 3px; + top: 3px; + } } } +@mixin icon-bg($icon, $align: middle) { + display: inline-block; + vertical-align: $align; + @extend .icon-#{$icon}; +} + .simple-social-button { + position: relative; + overflow: hidden; + font-family: "Lucida Grande", Helvetica, Arial, sans; display: inline-block; border: 1px solid #ccc; + padding: .2em .5em; line-height: 1.45em; + font-size: 11px; + font-weight: bold; + text-decoration: none; + text-shadow: #fff 0 1px; + @include border-radius(.3em); background-color: #e5e5e5; @include background-image(linear-gradient(#fff, #ddd)); &:hover { @@ -24,12 +49,10 @@ border-color: #b5b5b5; background-color: #ddd; } - padding: .2em .5em .1em; line-height: 1.45em; - font-size: 13px; - font-weight: bold; - text-decoration: none; - text-shadow: #fff 0 1px; - @include border-radius(.3em); + &:before { + content: ""; + display: inline-block; + } } .sharing { @@ -43,13 +66,13 @@ .googleplus-share { @extend .simple-social-button; - @include social-button-bg('googleplus.png', #db583b); + @include social-button-bg('googleplus', #db583b); } .facebook-share { @extend .simple-social-button; - @include social-button-bg('facebook.png', #4e5a9b); + @include social-button-bg('facebook', #4e5a9b); } .twitter-share, .sidebar a.twitter-follow-button { @extend .simple-social-button; - @include social-button-bg('twitter.png'); + @include social-button-bg('twitter'); } diff --git a/.themes/classic/source/_includes/after_footer.html b/.themes/classic/source/_includes/after_footer.html index 2aee47f..0324a32 100644 --- a/.themes/classic/source/_includes/after_footer.html +++ b/.themes/classic/source/_includes/after_footer.html @@ -1,7 +1,7 @@ {% include disqus.html %} -{% unless site.do_not_track %} -{% include facebook_like.html %} -{% include google_plus_one.html %} -{% include twitter_sharing.html %} +{% unless site.respectfully_social %} + {% include facebook_like.html %} + {% include google_plus_one.html %} + {% include twitter_sharing.html %} {% endunless %} {% include custom/after_footer.html %} diff --git a/.themes/classic/source/_includes/post/sharing.html b/.themes/classic/source/_includes/post/sharing.html index 0e04abb..ed9ea72 100644 --- a/.themes/classic/source/_includes/post/sharing.html +++ b/.themes/classic/source/_includes/post/sharing.html @@ -1,20 +1,20 @@
{% if site.twitter_tweet_button %} - {% if site.do_not_track %} + {% if site.respectfully_social %} Tweet {% else %} - Tweet + Tweet {% endif %} {% endif %} {% if site.google_plus_one %} - {% if site.do_not_track %} + {% if site.respectfully_social %} +1 {% else %}
{% endif %} {% endif %} {% if site.facebook_like %} - {% if site.do_not_track %} + {% if site.respectfully_social %} Share {% else %}
diff --git a/.themes/classic/source/images/facebook.png b/.themes/classic/source/images/facebook.png deleted file mode 100644 index 4d02a33..0000000 Binary files a/.themes/classic/source/images/facebook.png and /dev/null differ diff --git a/.themes/classic/source/images/googleplus.png b/.themes/classic/source/images/googleplus.png deleted file mode 100644 index c92bbf3..0000000 Binary files a/.themes/classic/source/images/googleplus.png and /dev/null differ diff --git a/.themes/classic/source/images/icon-s02358152fa.png b/.themes/classic/source/images/icon-s02358152fa.png new file mode 100644 index 0000000..6e40dd9 Binary files /dev/null and b/.themes/classic/source/images/icon-s02358152fa.png differ diff --git a/.themes/classic/source/images/icon/facebook.png b/.themes/classic/source/images/icon/facebook.png new file mode 100644 index 0000000..a24e61b Binary files /dev/null and b/.themes/classic/source/images/icon/facebook.png differ diff --git a/.themes/classic/source/images/icon/googleplus.png b/.themes/classic/source/images/icon/googleplus.png new file mode 100644 index 0000000..a0f785d Binary files /dev/null and b/.themes/classic/source/images/icon/googleplus.png differ diff --git a/.themes/classic/source/images/twitter.png b/.themes/classic/source/images/icon/twitter.png similarity index 100% rename from .themes/classic/source/images/twitter.png rename to .themes/classic/source/images/icon/twitter.png diff --git a/_config.yml b/_config.yml index 364bec3..f8437cc 100644 --- a/_config.yml +++ b/_config.yml @@ -65,8 +65,9 @@ default_asides: [asides/recent_posts.html, asides/github.html, asides/twitter.ht # 3rd Party Settings # # ----------------------- # -# Use text links instead of Javascript widgets for Twitter, Facebook and Google Plus -do_not_track: false +# Javascript social buttons often generate lots of http requests and may track viewers browsing history +# Show respect for privacy and bandwidth with simple links for Twitter, Facebook and Google Plus. +respectfully_social: true # Github repositories github_user: diff --git a/config.rb b/config.rb index 066427e..f0d44d1 100644 --- a/config.rb +++ b/config.rb @@ -4,6 +4,7 @@ project_type = :stand_alone # Publishing paths http_path = "/" http_images_path = "/images" +http_generated_images_path = "/images" http_fonts_path = "/fonts" css_dir = "public/stylesheets" @@ -11,6 +12,7 @@ css_dir = "public/stylesheets" sass_dir = "sass" images_dir = "source/images" fonts_dir = "source/fonts" +generated_images_dir = "source/images" line_comments = false output_style = :compressed