From 60da4ef010a129cebff0dec888a9d0bc5b60c478 Mon Sep 17 00:00:00 2001 From: Mads Ohm Larsen Date: Thu, 15 Jan 2015 22:04:00 +0100 Subject: [PATCH] Fix weird spacing --- CONTRIBUTING.markdown | 2 +- History.markdown | 2 +- benchmark/string-replacement | 4 ++-- lib/site_template/_includes/footer.html | 10 +++++----- lib/site_template/_layouts/post.html | 2 +- site/_sass/_style.scss | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.markdown b/CONTRIBUTING.markdown index 94533415..8bd2febe 100644 --- a/CONTRIBUTING.markdown +++ b/CONTRIBUTING.markdown @@ -67,7 +67,7 @@ You can find the documentation for jekyllrb.com in the [site](https://github.com/jekyll/jekyll/tree/master/site) directory of Jekyll's repo on GitHub.com. -All documentation pull requests should be directed at `master`. Pull +All documentation pull requests should be directed at `master`. Pull requests directed at another branch will not be accepted. The [Jekyll wiki](https://github.com/jekyll/jekyll/wiki) on GitHub diff --git a/History.markdown b/History.markdown index 67fdb963..a1eb3aa1 100644 --- a/History.markdown +++ b/History.markdown @@ -538,7 +538,7 @@ * Add `Jekyll::LiquidExtensions` with `.lookup_variable` method for easy looking up of variable values in a Liquid context. (#2253) * Remove literal lang name from class (#2292) - * Return `utf-8` encoding in header for webrick error page response (#2289) + * Return `utf-8` encoding in header for webrick error page response (#2289) * Make template site easier to customize (#2268) * Add two-digit year to permalink template option (#2301) * Add `site.documents` to Liquid payload (list of all docs) (#2295) diff --git a/benchmark/string-replacement b/benchmark/string-replacement index 13715376..36de613c 100644 --- a/benchmark/string-replacement +++ b/benchmark/string-replacement @@ -8,6 +8,6 @@ Benchmark.ips do |x| x.report('#tr') { str.tr('some', 'a') } x.report('#gsub') { str.gsub('some', 'a') } x.report('#gsub!') { str.gsub!('some', 'a') } - x.report('#sub') { str.sub('some', 'a') } - x.report('#sub!') { str.sub!('some', 'a') } + x.report('#sub') { str.sub('some', 'a') } + x.report('#sub!') { str.sub!('some', 'a') } end diff --git a/lib/site_template/_includes/footer.html b/lib/site_template/_includes/footer.html index be3976f7..ee8246a5 100644 --- a/lib/site_template/_includes/footer.html +++ b/lib/site_template/_includes/footer.html @@ -5,19 +5,19 @@

{{ site.title }}

-
+
-
+
-
+

{{ site.description }}

diff --git a/lib/site_template/_layouts/post.html b/lib/site_template/_layouts/post.html index d34c02d2..d4f8be3e 100644 --- a/lib/site_template/_layouts/post.html +++ b/lib/site_template/_layouts/post.html @@ -1,7 +1,7 @@ --- layout: default --- -
+

{{ page.title }}

diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss index 80b1d604..6c2a8158 100644 --- a/site/_sass/_style.scss +++ b/site/_sass/_style.scss @@ -288,7 +288,7 @@ footer { border-bottom: 1px solid #111; } - .shell { + .shell { padding: 20px; text-shadow: none; margin: 0 20px;