From fb34144d8065ec562ecc784faf2dc12d23ed433d Mon Sep 17 00:00:00 2001 From: Brandon Mathis Date: Tue, 5 Jun 2012 16:09:26 -0500 Subject: [PATCH] updated to latest theme --- .../source/images/icon-s7391265288.png | Bin 0 -> 965 bytes sass/partials/_sharing.scss | 8 ++++-- source/_includes/after_footer.html | 6 +++++ source/_includes/asides/github.html | 25 +++--------------- source/_includes/asides/twitter.html | 12 +-------- source/images/icon-s02358152fa.png | Bin 568 -> 0 bytes source/images/icon-s7391265288.png | Bin 0 -> 965 bytes source/images/icon/github.png | Bin 0 -> 398 bytes source/javascripts/github.js | 23 +++++++++++----- source/javascripts/twitter.js | 12 ++++++++- 10 files changed, 44 insertions(+), 42 deletions(-) create mode 100644 .themes/classic/source/images/icon-s7391265288.png delete mode 100644 source/images/icon-s02358152fa.png create mode 100644 source/images/icon-s7391265288.png create mode 100644 source/images/icon/github.png diff --git a/.themes/classic/source/images/icon-s7391265288.png b/.themes/classic/source/images/icon-s7391265288.png new file mode 100644 index 0000000000000000000000000000000000000000..5f8aa280a8befb1177fb12db3a551a01c9dcb793 GIT binary patch literal 965 zcmeAS@N?(olHy`uVBq!ia0vp^0zmA*!3-o-7PBv5U|?hl@Ck7Rat9C4nst?U{T1YspXe!&c!Jp7{4aw_Ut2F8{)u7Odp3CWo``4x@R<}Y2bdfmod zhmV~+bNfP#TTKtV(Q{Pp|K-+%vK!6BhxKad6sCm_VF6Bj&ZU|^E* zba4!+xV3fC`FtTqk>mFb^2?^lFLhXYmE-Fb<4*ex=3Chps8txeyq_uD+gi2a<4U*+g8=Ga^2*&-oDI4G^OqD-lpCFxnC@1B^s~#Pnj9n z9SbVCdaa_Sd7OKW>Y3&2x~5 z`yX+3_2gqBFTRC8J$&zu?1xF;&S(`!Tfcq(u6N0)2e-bxF*@T~r!~!&A?}xv=cc(n zVVCk}PFayH{@ITu%JTh=iHrYjzM;FMlX>}Bo7z7{Y>89e1$!k%IxVx~bYv1cA-#OU zCs(Grl+1O#MP;)Z^kf!sp0w*JWOAR7rz3hH#YJdVcB#^Z69)b@%hk>v>C!nDzhdXq z#S>WszsOnn|1diCurqFgLZ4#9wzs9T*=8T@db}-hmV1!T?voRrZ!i*g;J@IUc)rpG z`3iA{a*Kq$;!G1Ce!t5dTK=F*V}Vw(#McjdD|^umKzd@DsS>`qrp z$VxmLl-Ro@S;wKyoI&dQl=V>@)n7{%eV6h6{o<}!faVf`{N&eJ>jLjbojm$0dK-V~ zgrhfwY!b4&uDs`ZGH-q3=XeqJTR#|C)(Z=K6AHE6^6W9!o~kAF|3B#c7yiRCbM`s` T-uPA@P-gUW^>bP0l+XkKtG<1p literal 0 HcmV?d00001 diff --git a/sass/partials/_sharing.scss b/sass/partials/_sharing.scss index 0f8a4ac..dbc571e 100644 --- a/sass/partials/_sharing.scss +++ b/sass/partials/_sharing.scss @@ -11,7 +11,6 @@ width: image-width($img); height: image-height($img); position: absolute; left: 3px; - top: 3px; } } @else if $icon { padding-left: icon-sprite-width($icon) + 6px; @@ -19,7 +18,6 @@ vertical-align: middle; @extend .icon-#{$icon}; position: absolute; left: 3px; - top: 3px; } } } @@ -67,12 +65,18 @@ .googleplus-share { @extend .simple-social-button; @include social-button-bg('googleplus', #db583b); + &:before { top: 5px; } } .facebook-share { @extend .simple-social-button; @include social-button-bg('facebook', #4e5a9b); + &:before { top: 3px; } } .twitter-share, .sidebar a.twitter-follow-button { @extend .simple-social-button; @include social-button-bg('twitter'); } +.sidebar .github-follow { + @extend .simple-social-button; + @include social-button-bg('github'); +} diff --git a/source/_includes/after_footer.html b/source/_includes/after_footer.html index 0324a32..88c0de3 100644 --- a/source/_includes/after_footer.html +++ b/source/_includes/after_footer.html @@ -5,3 +5,9 @@ {% include twitter_sharing.html %} {% endunless %} {% include custom/after_footer.html %} +{% if site.github_user %} + +{% endif %} +{% if site.twitter_user %} + +{% endif %} diff --git a/source/_includes/asides/github.html b/source/_includes/asides/github.html index e470007..349ffbe 100644 --- a/source/_includes/asides/github.html +++ b/source/_includes/asides/github.html @@ -1,30 +1,11 @@ {% if site.github_user %}
-

GitHub Repos

-
    +

    On GitHub

    +
    • Status updating...
    {% if site.github_show_profile_link %} - @{{site.github_user}} on GitHub + Follow @{{site.github_user}} {% endif %} - -
{% endif %} diff --git a/source/_includes/asides/twitter.html b/source/_includes/asides/twitter.html index 32a894f..3954a8b 100644 --- a/source/_includes/asides/twitter.html +++ b/source/_includes/asides/twitter.html @@ -1,19 +1,9 @@ {% if site.twitter_user %}

Latest Tweets

-
    +
    • Status updating...
    - - {% if site.twitter_follow_button %} {% else %} diff --git a/source/images/icon-s02358152fa.png b/source/images/icon-s02358152fa.png deleted file mode 100644 index 6e40dd926f5c482492ac14087aa2211afa0cadcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 568 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!3-qz8@W<}R7HSKh%1oRnst?U-V3(|Ng&%LqfxTAPp8yK!``B&ws+e!07Jj z;uunKYwM&y|7HV`R{uf zSA;UwEHjyHygQmbAnBNj)4fWaj~#(^Aql5CRZXy}5j=n9*Hrxxp!_xoNs(im14|0XG>I=I;Ca22bTHuH@rw>6u47u&7ZongQ> z{T1YspXe!&c!Jp7{4aw_Ut2F8{)u7Odp3CWo``4x@R<}Y2bdfmod zhmV~+bNfP#TTKtV(Q{Pp|K-+%vK!6BhxKad6sCm_VF6Bj&ZU|^E* zba4!+xV3fC`FtTqk>mFb^2?^lFLhXYmE-Fb<4*ex=3Chps8txeyq_uD+gi2a<4U*+g8=Ga^2*&-oDI4G^OqD-lpCFxnC@1B^s~#Pnj9n z9SbVCdaa_Sd7OKW>Y3&2x~5 z`yX+3_2gqBFTRC8J$&zu?1xF;&S(`!Tfcq(u6N0)2e-bxF*@T~r!~!&A?}xv=cc(n zVVCk}PFayH{@ITu%JTh=iHrYjzM;FMlX>}Bo7z7{Y>89e1$!k%IxVx~bYv1cA-#OU zCs(Grl+1O#MP;)Z^kf!sp0w*JWOAR7rz3hH#YJdVcB#^Z69)b@%hk>v>C!nDzhdXq z#S>WszsOnn|1diCurqFgLZ4#9wzs9T*=8T@db}-hmV1!T?voRrZ!i*g;J@IUc)rpG z`3iA{a*Kq$;!G1Ce!t5dTK=F*V}Vw(#McjdD|^umKzd@DsS>`qrp z$VxmLl-Ro@S;wKyoI&dQl=V>@)n7{%eV6h6{o<}!faVf`{N&eJ>jLjbojm$0dK-V~ zgrhfwY!b4&uDs`ZGH-q3=XeqJTR#|C)(Z=K6AHE6^6W9!o~kAF|3B#c7yiRCbM`s` T-uPA@P-gUW^>bP0l+XkKtG<1p literal 0 HcmV?d00001 diff --git a/source/images/icon/github.png b/source/images/icon/github.png new file mode 100644 index 0000000000000000000000000000000000000000..c99ab237a7e77fd149fba63e15e3463b387c0689 GIT binary patch literal 398 zcmV;90df9`P)FzKH)jx*qFJZ+GK_>gF{$@&?*CC=Je?OrE?-zumcwSlr3$89=(}-wJ9vZDfr47 zZ(*FC#*RVHJ!I{S2poVq1IPx#07*qoM6N<$g5G'+repos[i].name+'

    '+repos[i].description+'

    '; + for(i = 0; i < data.length; i++) { + repos += '
  • '+data[i].name+'

    '+data[i].description+'

    • '; } - t.innerHTML = fragment; + target.html(repos); } return { showRepos: function(options){ $.ajax({ url: "https://api.github.com/users/"+options.user+"/repos?callback=?" , dataType: 'jsonp' - , error: function (err) { $(options.target + ' li.loading').addClass('error').text("Error loading feed"); } + , error: function (err) { options.target.find('.loading').addClass('error').text("Error loading feed"); } , success: function(data) { var repos = []; if (!data.data) { return; } @@ -35,3 +35,14 @@ var github = (function(){ } }; })(); + +$(document).ready(function(){ + g = $('#gh_repos'); + + github.showRepos({ + user: g.attr('data-user') + , count: parseInt(g.attr('data-count')) + , skip_forks: g.attr('data-skip') == 'true' + , target: g + }); +}); diff --git a/source/javascripts/twitter.js b/source/javascripts/twitter.js index b729b12..4f85e20 100644 --- a/source/javascripts/twitter.js +++ b/source/javascripts/twitter.js @@ -72,7 +72,8 @@ var twitter = (function(){ return { getFeed: function(options){ - count = parseInt(options.count, 10); + count = options.count; + console.log(options); $.ajax({ url: "http://api.twitter.com/1/statuses/user_timeline/" + options.user + ".json?trim_user=true&count=" + (count + 20) + "&include_entities=1&exclude_replies=" + (options.replies ? "0" : "1") + "&callback=?" , dataType: 'jsonp' @@ -82,3 +83,12 @@ var twitter = (function(){ } } })(); + +$(document).ready(function(){ + t = $('#tweets'); + twitter.getFeed({ + user: t.attr('data-user') + , count: parseInt(t.attr('data-count'), 10) + , replies: t.attr('data-replies') == 'true' + }); +});