Merge pull request #1202 from MrJoy/whitespace_cleanup
Clean up spurious trailing whitespace, and extra/missing newlines at EOF...
This commit is contained in:
Parker Moore
commit
5ff6cf90ac
|
|
@ -3,4 +3,4 @@
|
|||
# Google Analytics Configuration #
|
||||
# ---------------------------------- #
|
||||
|
||||
google_analytics_tracking_id:
|
||||
google_analytics_tracking_id:
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@ googleplus:
|
|||
image_size: 32
|
||||
|
||||
# Google+ Sharing
|
||||
plus_one: false
|
||||
plus_one: false
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
require_js:
|
||||
# Dependiences are added first as globals
|
||||
globals:
|
||||
globals:
|
||||
- lib/modernizr.js
|
||||
- lib/swfobject-dynamic.js
|
||||
- lib/*.*
|
||||
|
|
|
|||
|
|
@ -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: "→"
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ Helpers =
|
|||
.replace(/'/g, ''')
|
||||
.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
|
||||
|
|
|
|||
|
|
@ -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') )
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -189,4 +189,3 @@ body.sidebar-footer {
|
|||
ul, ol { margin-left: 0; }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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; }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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'); }
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 }
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<footer>
|
||||
{% if site.disqus_short_name and page.comments != false and post.comments != false and site.disqus_show_comment_count == true %}
|
||||
<p><a class="comments-link" href="{% if index %}{{ permalink }}{% endif %}#disqus_thread" data-disqus-identifier="{% if post.disqus_id %}{{ post.disqus_id }}{% else %}{{ site.url }}{{ post.url }}{% endif %}">View comments »</a></p>
|
||||
|
||||
|
||||
{% endif %}
|
||||
{% if excerpted != 'false' %}
|
||||
<p><a rel="full-article" href="{{ permalink }}">{{ site.excerpt_link }}</a></p>
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@
|
|||
|
||||
{% if was_updated != '0' %}
|
||||
{% capture updated %}<time datetime="{{ updated | datetime | date_to_xmlschema }}" class="updated">Updated {{ updated_formatted }}</time>{% endcapture %}
|
||||
{% else %}{% assign updated = false %}{% endif %}
|
||||
{% else %}{% assign updated = false %}{% endif %}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
{% endif %}
|
||||
{% if site.facebook_like %}
|
||||
{% if site.respectfully_social %}
|
||||
<a title="Share on Facebook" class="facebook-share" href="http://www.facebook.com/sharer.php?u={{site.url}}{{page.url}}" target="_blank">Share</a>
|
||||
<a title="Share on Facebook" class="facebook-share" href="http://www.facebook.com/sharer.php?u={{site.url}}{{page.url}}" target="_blank">Share</a>
|
||||
{% else %}
|
||||
{% if post.title %}
|
||||
<div class="fb-like" data-href="{{ site.url }}{{ post.url }}" data-send="true" data-width="450" data-show-faces="false"></div>
|
||||
|
|
|
|||
|
|
@ -22,4 +22,3 @@ layout: nil
|
|||
</entry>
|
||||
{% endfor %}
|
||||
</feed>
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
<element name="volumeSliderProgress" src="divider.png" />
|
||||
</elements>
|
||||
</component>
|
||||
|
||||
|
||||
<component name="display">
|
||||
<settings>
|
||||
<setting name="bufferinterval" value="250" />
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
<element name="bufferIcon" src="bufferIcon.png" />
|
||||
</elements>
|
||||
</component>
|
||||
|
||||
|
||||
<component name="dock">
|
||||
<settings>
|
||||
<setting name="fontcolor" value="0xFFFFFF" />
|
||||
|
|
@ -112,4 +112,4 @@
|
|||
|
||||
</components>
|
||||
|
||||
</skin>
|
||||
</skin>
|
||||
|
|
|
|||
|
|
@ -28,4 +28,3 @@ layout: default
|
|||
{% endif %}
|
||||
</aside>
|
||||
{% endunless %}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
layout: nil
|
||||
---
|
||||
User-agent: *
|
||||
Disallow:
|
||||
Disallow:
|
||||
|
||||
Sitemap: {{ site.url }}/sitemap.xml
|
||||
Sitemap: {{ site.url }}/sitemap.xml
|
||||
|
|
|
|||
2
Gemfile
2
Gemfile
|
|
@ -15,7 +15,7 @@ group :development do
|
|||
gem 'tzinfo', '~> 0.3.35'
|
||||
gem 'stitch-rb'
|
||||
gem 'uglifier'
|
||||
|
||||
|
||||
# Guard related
|
||||
gem 'guard'
|
||||
gem 'guard-shell'
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ guard :jekyll do
|
|||
end
|
||||
|
||||
guard :shell do
|
||||
# If a non template file changes, copy it to destination
|
||||
# If a non template file changes, copy it to destination
|
||||
watch /^#{configuration[:source]}\/.+\.[^(md|markdown|textile|html|haml|slim|xml)]/ do |m|
|
||||
if File.exists?(m.first)
|
||||
file = File.basename(m.first)
|
||||
|
|
|
|||
2
Rakefile
2
Rakefile
|
|
@ -506,7 +506,7 @@ task :setup_github_pages, :repo do |t, args|
|
|||
unless exit_status.success?
|
||||
error = ''
|
||||
while line = stdout_err.gets do error << line end
|
||||
puts "Be sure your repo (#{repo_url}) is set up properly and try again".red
|
||||
puts "Be sure your repo (#{repo_url}) is set up properly and try again".red
|
||||
abort error
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ class String
|
|||
def colorize(color_code)
|
||||
"\e[#{color_code}m#{self}\e[0m"
|
||||
end
|
||||
|
||||
|
||||
def black
|
||||
colorize(30)
|
||||
end
|
||||
|
||||
|
||||
def red
|
||||
colorize(31)
|
||||
end
|
||||
|
|
@ -19,7 +19,7 @@ class String
|
|||
def yellow
|
||||
colorize(33)
|
||||
end
|
||||
|
||||
|
||||
def blue
|
||||
colorize(34)
|
||||
end
|
||||
|
|
@ -27,15 +27,15 @@ class String
|
|||
def magenta
|
||||
colorize(35)
|
||||
end
|
||||
|
||||
|
||||
def cyan
|
||||
colorize(36)
|
||||
end
|
||||
|
||||
|
||||
def white
|
||||
colorize(37)
|
||||
end
|
||||
|
||||
|
||||
def bold
|
||||
colorize(1)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ module Guard
|
|||
Octopress.configurator.remove_configs_for_generation
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def run_on_changes(_)
|
||||
Octopress.configurator.write_configs_for_generation
|
||||
system "jekyll build #{"--drafts" unless Octopress.env == 'production'}"
|
||||
|
|
|
|||
|
|
@ -97,9 +97,10 @@ module Octopress
|
|||
configs = file_yaml.deep_merge(configs)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
configs.to_symbol_keys
|
||||
end
|
||||
|
||||
# Static: Writes configuration files necessary for generation of the Jekyll site
|
||||
#
|
||||
# Returns a Hash of the items which were written to the Jekyll configuration file
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ module Octopress
|
|||
|
||||
def initialize
|
||||
@js_assets_path = File.expand_path("../../assets/javascripts", File.dirname(__FILE__))
|
||||
|
||||
|
||||
unless Octopress.configuration.has_key? :require_js
|
||||
abort "No :require_js key in configuration. Cannot proceed.".red
|
||||
end
|
||||
|
|
@ -47,7 +47,7 @@ module Octopress
|
|||
|
||||
filename = url
|
||||
file = "#{@template_path + filename}"
|
||||
|
||||
|
||||
if File.exists?(file) and File.open(file) {|f| f.readline} =~ /#{@fingerprint}/
|
||||
false
|
||||
else
|
||||
|
|
@ -66,4 +66,3 @@ module Octopress
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ class ConfigTag < Liquid::Tag
|
|||
@tag = nil
|
||||
@classname = nil
|
||||
options.each do |option|
|
||||
@tag = $1 if option =~ /tag:(\S+)/
|
||||
@tag = $1 if option =~ /tag:(\S+)/
|
||||
@classname = $1 if option =~ /classname:(\S+)/
|
||||
end
|
||||
end
|
||||
|
|
@ -41,4 +41,3 @@ def config_tag(config, key, tag=nil, classname=nil)
|
|||
end
|
||||
|
||||
Liquid::Template.register_tag('config_tag', ConfigTag)
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ module Jekyll
|
|||
title = nil
|
||||
alt = nil
|
||||
attributes = ['class', 'src', 'width', 'height', 'alt']
|
||||
|
||||
|
||||
markup =~ /alt:(".+?")\s*/i
|
||||
alt = $1
|
||||
markup.sub! /alt:".+?"\s*/i, ''
|
||||
|
|
|
|||
Loading…
Reference in New Issue