From 0419b051439d14bd1f932a226dbabc66ff20a81f Mon Sep 17 00:00:00 2001 From: Jon Frisby Date: Wed, 10 Apr 2013 09:53:49 -0700 Subject: [PATCH] Clean up spurious trailing whitespace, and extra/missing newlines at EOF. --- .themes/classic/_config/google-analytics.yml | 2 +- .themes/classic/_config/google-plus.yml | 2 +- .themes/classic/_config/require-js.yml | 2 +- .themes/classic/_config/theme.yml | 4 ++-- .../classic/assets/javascripts/adn-timeline.coffee | 6 +++--- .../classic/assets/javascripts/delicious-feed.coffee | 4 ++-- .../classic/assets/javascripts/github-repos.coffee | 2 +- .themes/classic/assets/javascripts/github.coffee | 2 +- .themes/classic/assets/javascripts/helpers.coffee | 6 +++--- .themes/classic/assets/javascripts/lib/modernizr.js | 6 +++--- .themes/classic/assets/javascripts/lib/octopress.js | 3 +-- .../classic/assets/javascripts/pinboard-feed.coffee | 2 +- .themes/classic/assets/stylesheets/base/_layout.scss | 1 - .../classic/assets/stylesheets/partials/_blog.scss | 4 ++-- .../assets/stylesheets/partials/_navigation.scss | 1 - .../classic/assets/stylesheets/partials/_syntax.scss | 11 +++++------ .../classic/assets/stylesheets/plugins/_plugins.scss | 1 - .themes/classic/source/_includes/article.html | 2 +- .themes/classic/source/_includes/post/date.html | 2 +- .themes/classic/source/_includes/post/sharing.html | 2 +- .themes/classic/source/_layouts/category_feed.xml | 1 - .themes/classic/source/assets/jwplayer/glow/glow.xml | 6 +++--- .themes/classic/source/index.html | 1 - .themes/classic/source/robots.txt | 4 ++-- Gemfile | 2 +- Guardfile | 2 +- Rakefile | 2 +- lib/colors.rb | 12 ++++++------ lib/guard/jekyll.rb | 2 +- lib/octopress/configuration.rb | 3 ++- lib/octopress/js_asset_manager.rb | 5 ++--- plugins/config_tag.rb | 3 +-- plugins/image_tag.rb | 2 +- 33 files changed, 51 insertions(+), 59 deletions(-) diff --git a/.themes/classic/_config/google-analytics.yml b/.themes/classic/_config/google-analytics.yml index 6f85362..d4329eb 100644 --- a/.themes/classic/_config/google-analytics.yml +++ b/.themes/classic/_config/google-analytics.yml @@ -3,4 +3,4 @@ # Google Analytics Configuration # # ---------------------------------- # -google_analytics_tracking_id: +google_analytics_tracking_id: diff --git a/.themes/classic/_config/google-plus.yml b/.themes/classic/_config/google-plus.yml index f0b0f83..35f5463 100644 --- a/.themes/classic/_config/google-plus.yml +++ b/.themes/classic/_config/google-plus.yml @@ -10,4 +10,4 @@ googleplus: image_size: 32 # Google+ Sharing - plus_one: false \ No newline at end of file + plus_one: false diff --git a/.themes/classic/_config/require-js.yml b/.themes/classic/_config/require-js.yml index a1cd6b4..bb72c39 100644 --- a/.themes/classic/_config/require-js.yml +++ b/.themes/classic/_config/require-js.yml @@ -7,7 +7,7 @@ require_js: # Dependiences are added first as globals - globals: + globals: - lib/modernizr.js - lib/swfobject-dynamic.js - lib/*.* diff --git a/.themes/classic/_config/theme.yml b/.themes/classic/_config/theme.yml index a0f9884..ece157f 100644 --- a/.themes/classic/_config/theme.yml +++ b/.themes/classic/_config/theme.yml @@ -39,9 +39,9 @@ blog_index_sidebar: blog_index_default.html page_sidebar: page_default.html post_sidebar: post_default.html -recent_posts: 5 # Posts in the sidebar Recent Posts section +recent_posts: 5 # Posts in the sidebar Recent Posts section excerpt_link: "Read on →" # "Continue reading" link text at the bottom of excerpted articles -excerpt_in_feed: false # Truncate excerpted articles in the atom feed +excerpt_in_feed: false # Truncate excerpted articles in the atom feed permalink_label: "Permalink" permalink_label_feed: "★ Permalink" linklog_marker: "→" diff --git a/.themes/classic/assets/javascripts/adn-timeline.coffee b/.themes/classic/assets/javascripts/adn-timeline.coffee index e170052..6b1332c 100644 --- a/.themes/classic/assets/javascripts/adn-timeline.coffee +++ b/.themes/classic/assets/javascripts/adn-timeline.coffee @@ -43,7 +43,7 @@ Adn = $.removeCookie @cookie @timeline = [] init user, options, callback - else + else callback @template() else url = "https://alpha-api.app.net/stream/0/users/@#{user}/posts?" @@ -55,12 +55,12 @@ Adn = url: url dataType: 'jsonp' error: (err) => callback @errorTemplate - success: (response) => + success: (response) => @timeline = @timeline.concat response.data if @timeline.length < options.count options.max_id = response.meta.max_id init user, options, callback - else + else @timeline = @format @timeline.slice(0, options.count), user, options $.cookie @cookie, JSON.stringify @timeline, { path: '/' } callback @template() diff --git a/.themes/classic/assets/javascripts/delicious-feed.coffee b/.themes/classic/assets/javascripts/delicious-feed.coffee index 2ad48ff..9d21dac 100644 --- a/.themes/classic/assets/javascripts/delicious-feed.coffee +++ b/.themes/classic/assets/javascripts/delicious-feed.coffee @@ -5,7 +5,7 @@ Delicious = cookie: 'delicious-feed' classname: 'delicious-feed' - template: (data) -> + template: (data) -> helpers.linkFeed data, @classname errorTemplate: -> @@ -30,7 +30,7 @@ Delicious = url: "http://feeds.delicious.com/v2/json/#{user}?&count=#{options.count}&callback=?" dataType: 'jsonp' error: (err) => callback @errorTemplate - success: (data) => + success: (data) => data = @format data $.cookie @cookie, JSON.stringify data, { path: '/' } callback @template data diff --git a/.themes/classic/assets/javascripts/github-repos.coffee b/.themes/classic/assets/javascripts/github-repos.coffee index 1cf6e69..2274f88 100644 --- a/.themes/classic/assets/javascripts/github-repos.coffee +++ b/.themes/classic/assets/javascripts/github-repos.coffee @@ -52,7 +52,7 @@ GitHub = url: "https://api.github.com/users/#{user}/repos?callback=?" dataType: 'jsonp' error: (err) => callback @errorTemplate - success: (data) => + success: (data) => data = @format(data.data, options) $.cookie @cookie, JSON.stringify data, { path: '/' } callback @template data diff --git a/.themes/classic/assets/javascripts/github.coffee b/.themes/classic/assets/javascripts/github.coffee index 67aa535..f476265 100644 --- a/.themes/classic/assets/javascripts/github.coffee +++ b/.themes/classic/assets/javascripts/github.coffee @@ -52,7 +52,7 @@ GitHub = url: "https://api.github.com/users/#{user}/repos?callback=?" dataType: 'jsonp' error: (err) => callback @errorTemplate - success: (data) => + success: (data) => data = @format(data.data, options) $.cookie @cookie, JSON.stringify data, { path: '/' } callback @template data diff --git a/.themes/classic/assets/javascripts/helpers.coffee b/.themes/classic/assets/javascripts/helpers.coffee index c4aac88..1d2735c 100644 --- a/.themes/classic/assets/javascripts/helpers.coffee +++ b/.themes/classic/assets/javascripts/helpers.coffee @@ -29,7 +29,7 @@ Helpers = .replace(/'/g, ''') .replace(//g, '>') - + # Url helpers trimUrl: (url)-> @@ -83,8 +83,8 @@ Helpers = if days is 0 if secs < 60 then say.just_now - else if secs < 120 then say.minute_ago - else if secs < 3600 then mins + say.minutes_ago + else if secs < 120 then say.minute_ago + else if secs < 3600 then mins + say.minutes_ago else if secs < 7200 then say.hour_ago else hours + say.hours_ago else diff --git a/.themes/classic/assets/javascripts/lib/modernizr.js b/.themes/classic/assets/javascripts/lib/modernizr.js index c43b11e..0e67439 100644 --- a/.themes/classic/assets/javascripts/lib/modernizr.js +++ b/.themes/classic/assets/javascripts/lib/modernizr.js @@ -50,7 +50,7 @@ window.Modernizr = (function( window, document, undefined ) { }; } else { - hasOwnProp = function (object, property) { + hasOwnProp = function (object, property) { return ((property in object) && is(object.constructor.prototype[property], 'undefined')); }; } @@ -254,7 +254,7 @@ window.Modernizr = (function( window, document, undefined ) { } - return Modernizr; + return Modernizr; }; @@ -456,7 +456,7 @@ Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0));}; Modernizr.addTest('placeholder', function(){ - return !!( 'placeholder' in ( Modernizr.input || document.createElement('input') ) && + return !!( 'placeholder' in ( Modernizr.input || document.createElement('input') ) && 'placeholder' in ( Modernizr.textarea || document.createElement('textarea') ) ); diff --git a/.themes/classic/assets/javascripts/lib/octopress.js b/.themes/classic/assets/javascripts/lib/octopress.js index f8363d2..aadba62 100644 --- a/.themes/classic/assets/javascripts/lib/octopress.js +++ b/.themes/classic/assets/javascripts/lib/octopress.js @@ -38,7 +38,7 @@ var octopress = (function(){ } if (sections.length >= 3){ $('aside.sidebar').addClass('thirds'); } } - + , testFeature: function (features) { getTestClasses = function (tests) { classes = ''; @@ -98,4 +98,3 @@ $(document).ready(function() { octopress.addMobileNav(); octopress.addSidebarToggler(); }); - diff --git a/.themes/classic/assets/javascripts/pinboard-feed.coffee b/.themes/classic/assets/javascripts/pinboard-feed.coffee index a5802c8..b95c50a 100644 --- a/.themes/classic/assets/javascripts/pinboard-feed.coffee +++ b/.themes/classic/assets/javascripts/pinboard-feed.coffee @@ -34,7 +34,7 @@ Pinboard = dataType: 'jsonp' jsonp: 'cb' error: (err) => callback @errorTemplate - success: (data) => + success: (data) => data = @format data $.cookie @cookie, JSON.stringify data, { path: '/' } callback @template data diff --git a/.themes/classic/assets/stylesheets/base/_layout.scss b/.themes/classic/assets/stylesheets/base/_layout.scss index 8190342..a36ec0d 100644 --- a/.themes/classic/assets/stylesheets/base/_layout.scss +++ b/.themes/classic/assets/stylesheets/base/_layout.scss @@ -189,4 +189,3 @@ body.sidebar-footer { ul, ol { margin-left: 0; } } } - diff --git a/.themes/classic/assets/stylesheets/partials/_blog.scss b/.themes/classic/assets/stylesheets/partials/_blog.scss index 189f1e9..6ef86a6 100644 --- a/.themes/classic/assets/stylesheets/partials/_blog.scss +++ b/.themes/classic/assets/stylesheets/partials/_blog.scss @@ -79,8 +79,8 @@ article { @extend .separator; } p:last-child { margin-bottom: 0; } - .comments-link { - font-size: .8em; + .comments-link { + font-size: .8em; color: inherit; &:hover, &:focus { color: $link-color-hover; } } diff --git a/.themes/classic/assets/stylesheets/partials/_navigation.scss b/.themes/classic/assets/stylesheets/partials/_navigation.scss index b0bf3e4..5a3ed58 100644 --- a/.themes/classic/assets/stylesheets/partials/_navigation.scss +++ b/.themes/classic/assets/stylesheets/partials/_navigation.scss @@ -134,4 +134,3 @@ body > nav { a[rel=subscribe-rss]{ @include mask-subscription-nav('rss.png'); } a[rel=subscribe-email]{ @include mask-subscription-nav('email.png'); } } - diff --git a/.themes/classic/assets/stylesheets/partials/_syntax.scss b/.themes/classic/assets/stylesheets/partials/_syntax.scss index 8938975..8f498f8 100644 --- a/.themes/classic/assets/stylesheets/partials/_syntax.scss +++ b/.themes/classic/assets/stylesheets/partials/_syntax.scss @@ -42,17 +42,17 @@ figure.code { padding: 0; border: 0; margin-bottom: 1.5em; - pre { + pre { @include border-radius(0px); @include box-shadow(none); background: none; color: $base1; border: none; - padding: 0; + padding: 0; margin-bottom: 0; overflow: visible; font-style: normal; - font-weight: normal; + font-weight: normal; } figcaption { position: relative; @@ -86,7 +86,7 @@ figure.code { bottom: 0; } } - a { + a { position: absolute; right: .8em; @include hover-link; color: inherit; @@ -113,7 +113,7 @@ figure.code { border-bottom-width: 1px; } } - .unnumbered, .line-numbers { + .unnumbered, .line-numbers { .marked:after { border-left-width: 2px; } } } @@ -232,4 +232,3 @@ pre, figure .highlight { &::-webkit-scrollbar { height: .5em; background: $solar-scroll-bg; } &::-webkit-scrollbar-thumb:horizontal { background: $solar-scroll-thumb; -webkit-border-radius: 4px; border-radius: 4px } } - diff --git a/.themes/classic/assets/stylesheets/plugins/_plugins.scss b/.themes/classic/assets/stylesheets/plugins/_plugins.scss index 3b4ba0b..13ef5d9 100644 --- a/.themes/classic/assets/stylesheets/plugins/_plugins.scss +++ b/.themes/classic/assets/stylesheets/plugins/_plugins.scss @@ -3,4 +3,3 @@ Imported. Load order is alphabetical and styles can be overriden in custom/_style.scss which is loaded after all plugin stylesheets. */ - diff --git a/.themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html index 5d45445..fe0b696 100644 --- a/.themes/classic/source/_includes/article.html +++ b/.themes/classic/source/_includes/article.html @@ -14,7 +14,7 @@