From eae825cd75d2d1c2b7d11f518b7cc7d1e74dfcbe Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 12 May 2013 14:04:40 +0200 Subject: [PATCH 01/33] Site permalink based on a blog --- site/_config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/_config.yml b/site/_config.yml index 8b8c6fda..be08f44d 100644 --- a/site/_config.yml +++ b/site/_config.yml @@ -1,3 +1,4 @@ pygments: true relative_permalinks: false gauges_id: 503c5af6613f5d0f19000027 +permalink: /blog/:year/:month/:day/:title From 699ae71f67fd90d23743d4fe71a6386343729c4b Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 12 May 2013 14:04:54 +0200 Subject: [PATCH 02/33] Add blog to list of primary nav items --- site/_includes/primary-nav-items.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/site/_includes/primary-nav-items.html b/site/_includes/primary-nav-items.html index 57956ae0..4d2590dc 100644 --- a/site/_includes/primary-nav-items.html +++ b/site/_includes/primary-nav-items.html @@ -2,9 +2,12 @@
  • Overview
    • -
  • +
  • Docsumentation
    • +
  • + Blog +
  • View on GitHub
    • From cd3e95beacbd87640536e78d6cd55f811b5babb0 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 12 May 2013 14:05:22 +0200 Subject: [PATCH 03/33] Fix site title to use HTML entities --- site/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/index.html b/site/index.html index 93203ebd..a015de93 100644 --- a/site/index.html +++ b/site/index.html @@ -1,6 +1,6 @@ --- layout: default -title: Jekyll • Simple, blog-aware, static sites +title: Jekyll • Simple, blog-aware, static sites overview: true --- From 411911977b23d591a079528831d2c14455f849ed Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 12 May 2013 14:39:41 +0200 Subject: [PATCH 04/33] Call it "news" --- site/_config.yml | 2 +- site/_includes/primary-nav-items.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/_config.yml b/site/_config.yml index be08f44d..ac93b762 100644 --- a/site/_config.yml +++ b/site/_config.yml @@ -1,4 +1,4 @@ pygments: true relative_permalinks: false gauges_id: 503c5af6613f5d0f19000027 -permalink: /blog/:year/:month/:day/:title +permalink: /news/:year/:month/:day/:title diff --git a/site/_includes/primary-nav-items.html b/site/_includes/primary-nav-items.html index 4d2590dc..06b17c1b 100644 --- a/site/_includes/primary-nav-items.html +++ b/site/_includes/primary-nav-items.html @@ -6,7 +6,7 @@ Docsumentation
  • - Blog + News
  • View on GitHub From 49ca6d44846d29046bb27ad346a62f5615045fc3 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 12 May 2013 14:39:54 +0200 Subject: [PATCH 05/33] Styles for news --- site/css/style.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/site/css/style.css b/site/css/style.css index 5acea813..5d1e80b1 100644 --- a/site/css/style.css +++ b/site/css/style.css @@ -499,6 +499,20 @@ body > footer a:hover img { width: 100%; } +/* Blog */ + +section.news article h2 { + margin: 0; + padding-top: 10px; + border-top: rgba(220, 220, 220, 0.5) 1px solid; +} + +section.news .post-details { + padding: 0; + font-size: 0.8em; + color: gray; +} + /* Code Highlighting */ From 4687b1f010db9d8052276bd1e41d85808dba016c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 12 May 2013 14:40:02 +0200 Subject: [PATCH 06/33] news includes --- site/_includes/news_contents.html | 18 ++++++++++++++++++ site/_includes/news_contents_mobile.html | 11 +++++++++++ site/_includes/news_item.html | 7 +++++++ site/_layouts/news.html | 22 ++++++++++++++++++++++ 4 files changed, 58 insertions(+) create mode 100644 site/_includes/news_contents.html create mode 100644 site/_includes/news_contents_mobile.html create mode 100644 site/_includes/news_item.html create mode 100644 site/_layouts/news.html diff --git a/site/_includes/news_contents.html b/site/_includes/news_contents.html new file mode 100644 index 00000000..1da35f41 --- /dev/null +++ b/site/_includes/news_contents.html @@ -0,0 +1,18 @@ +
    + +
    diff --git a/site/_includes/news_contents_mobile.html b/site/_includes/news_contents_mobile.html new file mode 100644 index 00000000..e8fb55e7 --- /dev/null +++ b/site/_includes/news_contents_mobile.html @@ -0,0 +1,11 @@ +
    + +
    diff --git a/site/_includes/news_item.html b/site/_includes/news_item.html new file mode 100644 index 00000000..7a7ea4af --- /dev/null +++ b/site/_includes/news_item.html @@ -0,0 +1,7 @@ +

    {{ post.title }}

    +

    + {{ post.content }} +

    +

    + Posted on {{ post.date | date_to_string }} by @{{ post.author }}, filed in {{ post.categories | array_to_sentence_string }} +

    diff --git a/site/_layouts/news.html b/site/_layouts/news.html new file mode 100644 index 00000000..187c2b05 --- /dev/null +++ b/site/_layouts/news.html @@ -0,0 +1,22 @@ +--- +layout: default +--- + +
    +
    + + {% include news_contents_mobile.html %} + +
    +
    +

    {{ page.title }}

    + {{ content }} +
    +
    + + {% include news_contents.html %} + +
    + +
    +
    From f150ae209e98e507ffb5bd19dbab03c341aba2bd Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 12 May 2013 14:40:08 +0200 Subject: [PATCH 07/33] Posts! YAY! --- ...-06-jekyll-1-dot-0-dot-0-released.markdown | 22 +++++++++++++++ ...-08-jekyll-1-dot-0-dot-1-released.markdown | 26 ++++++++++++++++++ ...-12-jekyll-1-dot-0-dot-2-released.markdown | 27 +++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown create mode 100644 site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown create mode 100644 site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown diff --git a/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown b/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown new file mode 100644 index 00000000..5f092e1b --- /dev/null +++ b/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown @@ -0,0 +1,22 @@ +--- +layout: news +title: "Jekyll 1.0.0 Released" +date: "2013-05-06 02:12:52 +0200" +author: parkr +categories: [release, jekyll] +--- + +Hey! After many months of hard works by Jekyll's contributors, we're excited +to announce the first major release of the project in a long while. v1.0.0 is +finally here! While the list of improvements and bug fixes is [quite lengthy][history], +here are the highlights (thanks to @BenBalter for the examples and for compiling +this list): + +- Support for the Gist tag for easily embedding Gists ([example](https://gist.github.com/benbalter/5555251)) +- Automatically generated post excerpts ([example](https://gist.github.com/benbalter/5555369)) +- Save and preview drafts before publishing ([example](https://gist.github.com/benbalter/5555992)) + +_(Take a look at the [Upgrading][] page in the docs for more detailed information.)_ + +[history]: https://github.com/mojombo/jekyll/blob/master/History.markdown#100--2013-05-06 +[Upgrading]: /docs/upgrading/ \ No newline at end of file diff --git a/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown b/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown new file mode 100644 index 00000000..40df901a --- /dev/null +++ b/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown @@ -0,0 +1,26 @@ +--- +layout: news +title: "Jekyll 1.0.1 Released" +date: "2013-05-08 23:46:11 +0200" +author: parkr +categories: [release, jekyll] +--- + +_(Take a look at the [Upgrading][] page in the docs for more detailed information.)_ + +Hot on the trails of v1.0, v1.0.1 is out! Here are the highlights: + +* Add newer `language-` class name prefix to code blocks ([#1037][]) +* Commander error message now preferred over process abort with incorrect args ([#1040][]) +* Do not force use of toc_token when using generate_toc in RDiscount ([#1048][]) +* Make Redcarpet respect the pygments configuration option ([#1053][]) +* Fix the index build with LSI ([#1045][]) +* Don't print deprecation warning when no arguments are specified. ([#1041][]) +* Add missing `` to site template used by `new` subcommand, fixed typos in code ([#1032][]) + +{% assign issue_numbers = "1037|1040|1048|1053|1045|1041|1032" | split: "|" %} +{% for issue in issue_numbers %} +[#{{ issue }}]: https://github.com/mojombo/jekyll/issues/{{ issue }} +{% endfor %} + +[Upgrading]: /docs/upgrading/ \ No newline at end of file diff --git a/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown b/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown new file mode 100644 index 00000000..95bd3a61 --- /dev/null +++ b/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown @@ -0,0 +1,27 @@ +--- +layout: news +title: "Jekyll 1.0.2 Released" +date: "2013-05-12 14:45:00 +0200" +author: parkr +categories: [release, jekyll] +--- + +_(Take a look at the [Upgrading][] page in the docs for more detailed information.)_ + +v1.0.2 has some key bugfixes that optionally restore some behaviour from pre-1.0 +releases, and fix some other annoying bugs: + +* Backwards-compatibilize relative permalinks ([#1081][]) +* Add `jekyll doctor` command to check site for any known compatibility problems ([#1081][]) +* Deprecate old config `server_port`, match to `port` if `port` isn't set ([#1084][]) +* Update pygments.rb and kramdon versions to 0.5.0 and 1.0.2, respectively ([#1061][], [#1067][]) +* Fix issue when post categories are numbers ([#1078][]) +* Add a `data-lang=""` attribute to Redcarpet code blocks ([#1066][]) +* Catching that Redcarpet gem isn't installed ([#1059][]) + +{% assign issue_numbers = "1059|1061|1066|1067|1078|1081|1084" | split: "|" %} +{% for issue in issue_numbers %} +[#{{ issue }}]: https://github.com/mojombo/jekyll/issues/{{ issue }} +{% endfor %} + +[Upgrading]: /docs/upgrading/ \ No newline at end of file From 02d6d77964c2e0946aef5d325abcf6e8fe3d3610 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 12 May 2013 14:40:12 +0200 Subject: [PATCH 08/33] Index file for news --- site/news/index.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 site/news/index.md diff --git a/site/news/index.md b/site/news/index.md new file mode 100644 index 00000000..d016c462 --- /dev/null +++ b/site/news/index.md @@ -0,0 +1,15 @@ +--- +layout: news +title: News +permalink: /news/ +author: all +--- + +
    + {% for post in site.posts %} +
    + {% include news_item.html %} +
    + {% endfor %} +
    +
    From 43117b9d0fd61daff1114122a945d2996ff38fc6 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 12 May 2013 15:12:33 +0200 Subject: [PATCH 09/33] Beginnings of something beautiful --- site/_layouts/news.html | 2 +- site/_layouts/news_item.html | 28 +++++++++++++++++++ ...-06-jekyll-1-dot-0-dot-0-released.markdown | 2 +- ...-08-jekyll-1-dot-0-dot-1-released.markdown | 2 +- ...-12-jekyll-1-dot-0-dot-2-released.markdown | 2 +- site/css/style.css | 8 ++++-- 6 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 site/_layouts/news_item.html diff --git a/site/_layouts/news.html b/site/_layouts/news.html index 187c2b05..75435f7b 100644 --- a/site/_layouts/news.html +++ b/site/_layouts/news.html @@ -8,8 +8,8 @@ layout: default {% include news_contents_mobile.html %}
    +

    {{ page.title }}

    -

    {{ page.title }}

    {{ content }}
    diff --git a/site/_layouts/news_item.html b/site/_layouts/news_item.html new file mode 100644 index 00000000..8cff4e3d --- /dev/null +++ b/site/_layouts/news_item.html @@ -0,0 +1,28 @@ +--- +layout: default +--- + +
    +
    + + {% include news_contents_mobile.html %} + +
    +

    News

    +
    +

    {{ page.title }}

    +

    + {{ page.content }} +

    +

    + Posted on {{ page.date | date_to_string }} by @{{ page.author }}, filed in {{ page.categories | array_to_sentence_string }} +

    +
    +
    + + {% include news_contents.html %} + +
    + +
    +
    diff --git a/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown b/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown index 5f092e1b..9567c30a 100644 --- a/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown +++ b/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown @@ -1,5 +1,5 @@ --- -layout: news +layout: news_item title: "Jekyll 1.0.0 Released" date: "2013-05-06 02:12:52 +0200" author: parkr diff --git a/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown b/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown index 40df901a..e306818f 100644 --- a/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown +++ b/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown @@ -1,5 +1,5 @@ --- -layout: news +layout: news_item title: "Jekyll 1.0.1 Released" date: "2013-05-08 23:46:11 +0200" author: parkr diff --git a/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown b/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown index 95bd3a61..f95d8f35 100644 --- a/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown +++ b/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown @@ -1,5 +1,5 @@ --- -layout: news +layout: news_item title: "Jekyll 1.0.2 Released" date: "2013-05-12 14:45:00 +0200" author: parkr diff --git a/site/css/style.css b/site/css/style.css index 5d1e80b1..cac52784 100644 --- a/site/css/style.css +++ b/site/css/style.css @@ -499,9 +499,13 @@ body > footer a:hover img { width: 100%; } -/* Blog */ +/* News */ -section.news article h2 { +section.news .news-header { + margin: 0 50px; +} + +section.news .news-listing h2 { margin: 0; padding-top: 10px; border-top: rgba(220, 220, 220, 0.5) 1px solid; From f0f36466b523fad93125d2d18119fba55cfa518e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 30 Jun 2013 16:52:02 +0200 Subject: [PATCH 10/33] Linkify @benbalter's mention in Jekyll 1.0.0 release post. --- .../2013-05-06-jekyll-1-dot-0-dot-0-released.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown b/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown index 9567c30a..0dc685fb 100644 --- a/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown +++ b/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown @@ -9,8 +9,8 @@ categories: [release, jekyll] Hey! After many months of hard works by Jekyll's contributors, we're excited to announce the first major release of the project in a long while. v1.0.0 is finally here! While the list of improvements and bug fixes is [quite lengthy][history], -here are the highlights (thanks to @BenBalter for the examples and for compiling -this list): +here are the highlights (thanks to [@BenBalter](http://twitter.com/BenBalter) for the +examples and for compiling this list): - Support for the Gist tag for easily embedding Gists ([example](https://gist.github.com/benbalter/5555251)) - Automatically generated post excerpts ([example](https://gist.github.com/benbalter/5555369)) @@ -19,4 +19,4 @@ this list): _(Take a look at the [Upgrading][] page in the docs for more detailed information.)_ [history]: https://github.com/mojombo/jekyll/blob/master/History.markdown#100--2013-05-06 -[Upgrading]: /docs/upgrading/ \ No newline at end of file +[Upgrading]: /docs/upgrading/ From 74ee8c3bf35c26dbcbeb56fad80bde6891f11f65 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 1 Jul 2013 01:19:25 +0200 Subject: [PATCH 11/33] Some very, very minor work on the posts. --- site/_includes/news_item.html | 20 +++++++++++++------- site/_layouts/news.html | 4 ++-- site/_layouts/news_item.html | 28 ---------------------------- site/css/style.css | 33 ++++++++++++++++++++++++++++++--- site/news/index.md | 2 +- 5 files changed, 46 insertions(+), 41 deletions(-) diff --git a/site/_includes/news_item.html b/site/_includes/news_item.html index 7a7ea4af..7068a692 100644 --- a/site/_includes/news_item.html +++ b/site/_includes/news_item.html @@ -1,7 +1,13 @@ -

    {{ post.title }}

    -

    - {{ post.content }} -

    -

    - Posted on {{ post.date | date_to_string }} by @{{ post.author }}, filed in {{ post.categories | array_to_sentence_string }} -

    +
    +

    + + {{ post.title }} + +

    +

    + {{ post.content }} +

    +

    + Posted on {{ post.date | date_to_string }} by @{{ post.author }}, filed in {{ post.categories | array_to_sentence_string }} +

    +
    diff --git a/site/_layouts/news.html b/site/_layouts/news.html index 75435f7b..ae4a1d1b 100644 --- a/site/_layouts/news.html +++ b/site/_layouts/news.html @@ -2,14 +2,14 @@ layout: default --- -
    +
    {% include news_contents_mobile.html %}

    {{ page.title }}

    -
    +
    {{ content }}
    diff --git a/site/_layouts/news_item.html b/site/_layouts/news_item.html index 8cff4e3d..e69de29b 100644 --- a/site/_layouts/news_item.html +++ b/site/_layouts/news_item.html @@ -1,28 +0,0 @@ ---- -layout: default ---- - -
    -
    - - {% include news_contents_mobile.html %} - -
    -

    News

    -
    -

    {{ page.title }}

    -

    - {{ page.content }} -

    -

    - Posted on {{ page.date | date_to_string }} by @{{ page.author }}, filed in {{ page.categories | array_to_sentence_string }} -

    -
    -
    - - {% include news_contents.html %} - -
    - -
    -
    diff --git a/site/css/style.css b/site/css/style.css index cac52784..8d17ad9c 100644 --- a/site/css/style.css +++ b/site/css/style.css @@ -501,17 +501,44 @@ body > footer a:hover img { /* News */ -section.news .news-header { +.news .news-header { margin: 0 50px; } -section.news .news-listing h2 { +.news .entry { + background: #444; + border-radius: 10px; + padding: 20px; + margin: 0 10px; + box-shadow: 0 3px 10px rgba(0,0,0,.1); + min-height: 800px; + font-size: 16px; +} + +@media (max-width: 568px){ + .news .entry { + margin: 0; + } +} + +@media (min-width: 768px){ + .news .entry { + font-size: 21px; + margin-bottom: 20px; + } +} + +.news .post { + padding: 40px; +} + +.news .news-listing h2 { margin: 0; padding-top: 10px; border-top: rgba(220, 220, 220, 0.5) 1px solid; } -section.news .post-details { +.news .post-details { padding: 0; font-size: 0.8em; color: gray; diff --git a/site/news/index.md b/site/news/index.md index d016c462..e3e664f1 100644 --- a/site/news/index.md +++ b/site/news/index.md @@ -7,7 +7,7 @@ author: all
    {% for post in site.posts %} -
    +
    {% include news_item.html %}
    {% endfor %} From c853de4800dd3022ac4f346c8b5bfe0ff67d0e3d Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 6 Jul 2013 14:34:34 +0200 Subject: [PATCH 12/33] Cleaned up post details markup --- site/_includes/news_item.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/site/_includes/news_item.html b/site/_includes/news_item.html index 7068a692..61a60741 100644 --- a/site/_includes/news_item.html +++ b/site/_includes/news_item.html @@ -8,6 +8,8 @@ {{ post.content }}

    - Posted on {{ post.date | date_to_string }} by @{{ post.author }}, filed in {{ post.categories | array_to_sentence_string }} + Posted on {{ post.date | date_to_string }} + by @{{ post.author }}, + filed in {{ post.categories | array_to_sentence_string }}

    From 0f9d205d05c5a452411a2f2a055fa200480a7901 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 6 Jul 2013 14:34:49 +0200 Subject: [PATCH 13/33] Camelcasing is so 2005. --- site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown b/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown index 0dc685fb..58642d1b 100644 --- a/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown +++ b/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown @@ -9,7 +9,7 @@ categories: [release, jekyll] Hey! After many months of hard works by Jekyll's contributors, we're excited to announce the first major release of the project in a long while. v1.0.0 is finally here! While the list of improvements and bug fixes is [quite lengthy][history], -here are the highlights (thanks to [@BenBalter](http://twitter.com/BenBalter) for the +here are the highlights (thanks to [@benbalter](http://twitter.com/BenBalter) for the examples and for compiling this list): - Support for the Gist tag for easily embedding Gists ([example](https://gist.github.com/benbalter/5555251)) From 01a04c8467083e5616d2627beca3c888d4095da0 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 6 Jul 2013 14:35:24 +0200 Subject: [PATCH 14/33] Tweaks to News design --- site/css/style.css | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/site/css/style.css b/site/css/style.css index 8d17ad9c..d86e6d9b 100644 --- a/site/css/style.css +++ b/site/css/style.css @@ -502,7 +502,7 @@ body > footer a:hover img { /* News */ .news .news-header { - margin: 0 50px; + margin: 10px 50px; } .news .entry { @@ -511,13 +511,12 @@ body > footer a:hover img { padding: 20px; margin: 0 10px; box-shadow: 0 3px 10px rgba(0,0,0,.1); - min-height: 800px; font-size: 16px; } @media (max-width: 568px){ .news .entry { - margin: 0; + margin: 0 0 20px 0; } } @@ -532,12 +531,20 @@ body > footer a:hover img { padding: 40px; } +.news .post.single { + padding-top: 10px; +} + .news .news-listing h2 { margin: 0; padding-top: 10px; border-top: rgba(220, 220, 220, 0.5) 1px solid; } +.news .listing h2 { + margin-top: 0; +} + .news .post-details { padding: 0; font-size: 0.8em; From 27c915b9087e2e40154fda23bb5c5778fb505d1f Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 6 Jul 2013 14:35:42 +0200 Subject: [PATCH 15/33] CSS for news aside. --- site/css/style.css | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/site/css/style.css b/site/css/style.css index d86e6d9b..ccc76ed5 100644 --- a/site/css/style.css +++ b/site/css/style.css @@ -551,6 +551,46 @@ body > footer a:hover img { color: gray; } +.news aside { + padding-top: 95px; + padding-left: 20px; +} + +.news aside h4 { + text-transform: uppercase; + font-size: 14px; + font-weight: 700; + padding: 0 0 10px 29px; + margin-left: -29px; + display: inline-block; + border-bottom: 1px solid #c00; +} + +.news aside ul { + padding-left: 0; +} + +.news aside li { + list-style-type: none; +} + +.news aside li a { + font-size: 16px; + position: relative +} + +.news aside li.current a:before { + content: ""; + border-color: transparent transparent transparent #444; + border-style: solid; + border-width: 10px; + width: 0; + height: 0; + position: absolute; + top: 0; + left: -30px; +} + /* Code Highlighting */ From ca6f3614a4de080576d26fed2a3a5d1c427fe55a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 6 Jul 2013 14:35:54 +0200 Subject: [PATCH 16/33] Each mobile nav item should only be 25% wide. --- site/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/css/style.css b/site/css/style.css index ccc76ed5..24e8db26 100644 --- a/site/css/style.css +++ b/site/css/style.css @@ -117,7 +117,7 @@ nav li { .mobile-nav li { display: table-cell; - width: 33.3%; + width: 25%; padding: 8px; } From d8cf817b857880e1b05efbe085362075725b3fb5 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 6 Jul 2013 14:36:02 +0200 Subject: [PATCH 17/33] Add news_item layout for each post --- site/_layouts/news_item.html | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/site/_layouts/news_item.html b/site/_layouts/news_item.html index e69de29b..cae58e61 100644 --- a/site/_layouts/news_item.html +++ b/site/_layouts/news_item.html @@ -0,0 +1,19 @@ +--- +layout: news +--- + +
    +
    +
    +

    + {{ content }} +

    +

    + Posted on {{ page.date | date_to_string }} + by @{{ page.author }}, + filed in {{ page.categories | array_to_sentence_string }} +

    +
    +
    +
    +
    From caa248201436fa1af11d0b754ba72be3b67d7c33 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 6 Jul 2013 14:36:11 +0200 Subject: [PATCH 18/33] Don't center the posts on mobile --- site/news/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/news/index.md b/site/news/index.md index e3e664f1..d9f91f46 100644 --- a/site/news/index.md +++ b/site/news/index.md @@ -7,7 +7,7 @@ author: all
    {% for post in site.posts %} -
    +
    {% include news_item.html %}
    {% endfor %} From 78d169ce05ea395d0e2978ce54f81e153a1df04e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 6 Jul 2013 14:58:35 +0200 Subject: [PATCH 19/33] Add post about Jekyll v1.0.3 --- ...-07-jekyll-1-dot-0-dot-3-released.markdown | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown diff --git a/site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown b/site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown new file mode 100644 index 00000000..785bf6a1 --- /dev/null +++ b/site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown @@ -0,0 +1,24 @@ +--- +layout: news_item +title: "Jekyll 1.0.3 Released" +date: "2013-06-07 21:02:13 +0200" +author: parkr +categories: [release, jekyll] +--- + +_(Take a look at the [History][] page in the docs for more detailed information.)_ + +v1.0.3 contains some key enhancements and bug fixes: + +- Fail with non-zero exit code when MaRuKu errors ([#1190][]) or Liquid errors ([#1121][]) +- Add support for private gists to `gist` tag ([#1189][]) +- Add `--force` option to `jekyll new` ([#1115][]) +- Fix compatibility with `exclude` and `include` with pre-1.0 Jekyll ([#1114][]) +- Fix pagination issue regarding `File.basename` and `page:num` ([#1063][]) + +{% assign issue_numbers = "1190|1121|1189|1115|1114|1063" | split: "|" %} +{% for issue in issue_numbers %} +[#{{ issue }}]: https://github.com/mojombo/jekyll/issues/{{ issue }} +{% endfor %} + +[History]: /docs/history/#103__20130607 From 91427c16ec6f19e36bd25025f067ef65fd3b83c1 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 6 Jul 2013 14:58:46 +0200 Subject: [PATCH 20/33] Update links to history page in blog posts. --- site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown | 2 +- site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown | 4 ++-- site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown b/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown index 58642d1b..7e55692b 100644 --- a/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown +++ b/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown @@ -18,5 +18,5 @@ examples and for compiling this list): _(Take a look at the [Upgrading][] page in the docs for more detailed information.)_ -[history]: https://github.com/mojombo/jekyll/blob/master/History.markdown#100--2013-05-06 +[history]: /docs/history/#100__20130506 [Upgrading]: /docs/upgrading/ diff --git a/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown b/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown index e306818f..fbcd42ed 100644 --- a/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown +++ b/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown @@ -6,7 +6,7 @@ author: parkr categories: [release, jekyll] --- -_(Take a look at the [Upgrading][] page in the docs for more detailed information.)_ +_(Take a look at the [History][] page in the docs for more detailed information.)_ Hot on the trails of v1.0, v1.0.1 is out! Here are the highlights: @@ -23,4 +23,4 @@ Hot on the trails of v1.0, v1.0.1 is out! Here are the highlights: [#{{ issue }}]: https://github.com/mojombo/jekyll/issues/{{ issue }} {% endfor %} -[Upgrading]: /docs/upgrading/ \ No newline at end of file +[History]: /docs/history/#101__20130508 diff --git a/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown b/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown index f95d8f35..30814444 100644 --- a/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown +++ b/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown @@ -6,7 +6,7 @@ author: parkr categories: [release, jekyll] --- -_(Take a look at the [Upgrading][] page in the docs for more detailed information.)_ +_(Take a look at the [History][] page in the docs for more detailed information.)_ v1.0.2 has some key bugfixes that optionally restore some behaviour from pre-1.0 releases, and fix some other annoying bugs: @@ -24,4 +24,4 @@ releases, and fix some other annoying bugs: [#{{ issue }}]: https://github.com/mojombo/jekyll/issues/{{ issue }} {% endfor %} -[Upgrading]: /docs/upgrading/ \ No newline at end of file +[History]: /docs/history/#102__20130512 From 6b829421566a8ae68e097a9c27e8dc1b07a96977 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 6 Jul 2013 17:10:57 +0200 Subject: [PATCH 21/33] s/works/work/ props @benbalter --- site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown b/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown index 7e55692b..366eeee3 100644 --- a/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown +++ b/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown @@ -6,7 +6,7 @@ author: parkr categories: [release, jekyll] --- -Hey! After many months of hard works by Jekyll's contributors, we're excited +Hey! After many months of hard work by Jekyll's contributors, we're excited to announce the first major release of the project in a long while. v1.0.0 is finally here! While the list of improvements and bug fixes is [quite lengthy][history], here are the highlights (thanks to [@benbalter](http://twitter.com/BenBalter) for the From 5737a5078216d532d0ed5f4072878d843d0e561d Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 6 Jul 2013 17:13:20 +0200 Subject: [PATCH 22/33] Don't offer more before you've given any. props @benbalter --- site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown | 4 ++-- site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown | 4 ++-- site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown b/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown index fbcd42ed..0304b2c6 100644 --- a/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown +++ b/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown @@ -6,8 +6,6 @@ author: parkr categories: [release, jekyll] --- -_(Take a look at the [History][] page in the docs for more detailed information.)_ - Hot on the trails of v1.0, v1.0.1 is out! Here are the highlights: * Add newer `language-` class name prefix to code blocks ([#1037][]) @@ -18,6 +16,8 @@ Hot on the trails of v1.0, v1.0.1 is out! Here are the highlights: * Don't print deprecation warning when no arguments are specified. ([#1041][]) * Add missing `
    ` to site template used by `new` subcommand, fixed typos in code ([#1032][]) +_(Take a look at the [History][] page in the docs for more detailed information.)_ + {% assign issue_numbers = "1037|1040|1048|1053|1045|1041|1032" | split: "|" %} {% for issue in issue_numbers %} [#{{ issue }}]: https://github.com/mojombo/jekyll/issues/{{ issue }} diff --git a/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown b/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown index 30814444..d5b0083a 100644 --- a/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown +++ b/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown @@ -6,8 +6,6 @@ author: parkr categories: [release, jekyll] --- -_(Take a look at the [History][] page in the docs for more detailed information.)_ - v1.0.2 has some key bugfixes that optionally restore some behaviour from pre-1.0 releases, and fix some other annoying bugs: @@ -19,6 +17,8 @@ releases, and fix some other annoying bugs: * Add a `data-lang=""` attribute to Redcarpet code blocks ([#1066][]) * Catching that Redcarpet gem isn't installed ([#1059][]) +_(Take a look at the [History][] page in the docs for more detailed information.)_ + {% assign issue_numbers = "1059|1061|1066|1067|1078|1081|1084" | split: "|" %} {% for issue in issue_numbers %} [#{{ issue }}]: https://github.com/mojombo/jekyll/issues/{{ issue }} diff --git a/site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown b/site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown index 785bf6a1..8f921519 100644 --- a/site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown +++ b/site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown @@ -6,8 +6,6 @@ author: parkr categories: [release, jekyll] --- -_(Take a look at the [History][] page in the docs for more detailed information.)_ - v1.0.3 contains some key enhancements and bug fixes: - Fail with non-zero exit code when MaRuKu errors ([#1190][]) or Liquid errors ([#1121][]) @@ -16,6 +14,8 @@ v1.0.3 contains some key enhancements and bug fixes: - Fix compatibility with `exclude` and `include` with pre-1.0 Jekyll ([#1114][]) - Fix pagination issue regarding `File.basename` and `page:num` ([#1063][]) +_(Take a look at the [History][] page in the docs for more detailed information.)_ + {% assign issue_numbers = "1190|1121|1189|1115|1114|1063" | split: "|" %} {% for issue in issue_numbers %} [#{{ issue }}]: https://github.com/mojombo/jekyll/issues/{{ issue }} From 6950809900ab0689c4eda91af67d2405f414d70e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 6 Jul 2013 17:19:59 +0200 Subject: [PATCH 23/33] Remove "-dot-"'s from release posts. Props @benbalter. --- ...eleased.markdown => 2013-05-06-jekyll-1-0-0-released.markdown} | 0 ...eleased.markdown => 2013-05-08-jekyll-1-0-1-released.markdown} | 0 ...eleased.markdown => 2013-05-12-jekyll-1-0-2-released.markdown} | 0 ...eleased.markdown => 2013-06-07-jekyll-1-0-3-released.markdown} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename site/_posts/{2013-05-06-jekyll-1-dot-0-dot-0-released.markdown => 2013-05-06-jekyll-1-0-0-released.markdown} (100%) rename site/_posts/{2013-05-08-jekyll-1-dot-0-dot-1-released.markdown => 2013-05-08-jekyll-1-0-1-released.markdown} (100%) rename site/_posts/{2013-05-12-jekyll-1-dot-0-dot-2-released.markdown => 2013-05-12-jekyll-1-0-2-released.markdown} (100%) rename site/_posts/{2013-06-07-jekyll-1-dot-0-dot-3-released.markdown => 2013-06-07-jekyll-1-0-3-released.markdown} (100%) diff --git a/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown b/site/_posts/2013-05-06-jekyll-1-0-0-released.markdown similarity index 100% rename from site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown rename to site/_posts/2013-05-06-jekyll-1-0-0-released.markdown diff --git a/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown b/site/_posts/2013-05-08-jekyll-1-0-1-released.markdown similarity index 100% rename from site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown rename to site/_posts/2013-05-08-jekyll-1-0-1-released.markdown diff --git a/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown b/site/_posts/2013-05-12-jekyll-1-0-2-released.markdown similarity index 100% rename from site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown rename to site/_posts/2013-05-12-jekyll-1-0-2-released.markdown diff --git a/site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown b/site/_posts/2013-06-07-jekyll-1-0-3-released.markdown similarity index 100% rename from site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown rename to site/_posts/2013-06-07-jekyll-1-0-3-released.markdown From b6c86579f3b47b097e587d688651782eaeea066f Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 6 Jul 2013 18:05:27 +0200 Subject: [PATCH 24/33] Add feed and link to feed in header. Props @benbalter --- site/_includes/top.html | 1 + site/feed.xml | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 site/feed.xml diff --git a/site/_includes/top.html b/site/_includes/top.html index 3b5c630b..9a0d5a8f 100644 --- a/site/_includes/top.html +++ b/site/_includes/top.html @@ -4,6 +4,7 @@ {{ page.title }} + diff --git a/site/feed.xml b/site/feed.xml new file mode 100644 index 00000000..bd49bd69 --- /dev/null +++ b/site/feed.xml @@ -0,0 +1,36 @@ +--- +layout: none +permalink: /feed.xml +--- + + + + + Jekyll • Simple, blog-aware, static sites + + http://jekyllrb.com + {{ site.time | date: "%a, %d %b %Y %H:%M:%S %z" }} + {{ site.time | date: "%a, %d %b %Y %H:%M:%S %z" }} + en-US + Transform your plain text into static websites and blogs. + {% for post in site.posts %} + + {{ post.title }} + http://jekyllrb.com{{ post.url }} + {{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }} + {{ post.author }} + {% for tag in post.tags %}{{ tag | xml_escape }} + {% endfor %}{% for cat in post.categories %}{{ cat | xml_escape }} + {% endfor %}{{ post.id }} + + + {% endfor %} + + From cf25da9431f7de7af632ac2dcfa4ad4d686432fe Mon Sep 17 00:00:00 2001 From: Coby Chapple Date: Mon, 8 Jul 2013 14:28:03 +0100 Subject: [PATCH 25/33] kill the above-container heading --- site/_layouts/news.html | 1 - site/css/style.css | 4 ---- 2 files changed, 5 deletions(-) diff --git a/site/_layouts/news.html b/site/_layouts/news.html index ae4a1d1b..e4830af5 100644 --- a/site/_layouts/news.html +++ b/site/_layouts/news.html @@ -8,7 +8,6 @@ layout: default {% include news_contents_mobile.html %}
    -

    {{ page.title }}

    {{ content }}
    diff --git a/site/css/style.css b/site/css/style.css index 24e8db26..715d0dc3 100644 --- a/site/css/style.css +++ b/site/css/style.css @@ -501,10 +501,6 @@ body > footer a:hover img { /* News */ -.news .news-header { - margin: 10px 50px; -} - .news .entry { background: #444; border-radius: 10px; From 74d90626b34b94f5cd52bb597c13b389aa5bece0 Mon Sep 17 00:00:00 2001 From: Coby Chapple Date: Mon, 8 Jul 2013 14:56:44 +0100 Subject: [PATCH 26/33] reorganize categories and right sidebar for more clarity --- site/_includes/news_contents.html | 15 ++++++++++----- site/_layouts/news_item.html | 5 +++++ ...3-05-06-jekyll-1-dot-0-dot-0-released.markdown | 3 ++- ...3-05-08-jekyll-1-dot-0-dot-1-released.markdown | 3 ++- ...3-05-12-jekyll-1-dot-0-dot-2-released.markdown | 3 ++- ...3-06-07-jekyll-1-dot-0-dot-3-released.markdown | 3 ++- site/css/style.css | 1 - site/news/releases/index.md | 15 +++++++++++++++ 8 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 site/news/releases/index.md diff --git a/site/_includes/news_contents.html b/site/_includes/news_contents.html index 1da35f41..f22a1a1a 100644 --- a/site/_includes/news_contents.html +++ b/site/_includes/news_contents.html @@ -1,18 +1,23 @@
    diff --git a/site/_layouts/news_item.html b/site/_layouts/news_item.html index cae58e61..424dad65 100644 --- a/site/_layouts/news_item.html +++ b/site/_layouts/news_item.html @@ -5,6 +5,11 @@ layout: news
    +

    + + {{ page.title }} + +

    {{ content }}

    diff --git a/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown b/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown index 7e55692b..2120a3b2 100644 --- a/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown +++ b/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown @@ -3,7 +3,8 @@ layout: news_item title: "Jekyll 1.0.0 Released" date: "2013-05-06 02:12:52 +0200" author: parkr -categories: [release, jekyll] +version: 1.0.0 +categories: [releases, general] --- Hey! After many months of hard works by Jekyll's contributors, we're excited diff --git a/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown b/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown index fbcd42ed..9c618800 100644 --- a/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown +++ b/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown @@ -3,7 +3,8 @@ layout: news_item title: "Jekyll 1.0.1 Released" date: "2013-05-08 23:46:11 +0200" author: parkr -categories: [release, jekyll] +version: 1.0.1 +categories: [releases, general] --- _(Take a look at the [History][] page in the docs for more detailed information.)_ diff --git a/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown b/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown index 30814444..c9202035 100644 --- a/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown +++ b/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown @@ -3,7 +3,8 @@ layout: news_item title: "Jekyll 1.0.2 Released" date: "2013-05-12 14:45:00 +0200" author: parkr -categories: [release, jekyll] +version: 1.0.2 +categories: [releases, general] --- _(Take a look at the [History][] page in the docs for more detailed information.)_ diff --git a/site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown b/site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown index 785bf6a1..8297b089 100644 --- a/site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown +++ b/site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown @@ -3,7 +3,8 @@ layout: news_item title: "Jekyll 1.0.3 Released" date: "2013-06-07 21:02:13 +0200" author: parkr -categories: [release, jekyll] +version: 1.0.3 +categories: [releases, general] --- _(Take a look at the [History][] page in the docs for more detailed information.)_ diff --git a/site/css/style.css b/site/css/style.css index 715d0dc3..ea2110aa 100644 --- a/site/css/style.css +++ b/site/css/style.css @@ -548,7 +548,6 @@ body > footer a:hover img { } .news aside { - padding-top: 95px; padding-left: 20px; } diff --git a/site/news/releases/index.md b/site/news/releases/index.md new file mode 100644 index 00000000..d3f6d98b --- /dev/null +++ b/site/news/releases/index.md @@ -0,0 +1,15 @@ +--- +layout: news +title: Releases +permalink: /news/releases/ +author: all +--- + +
    +{% for post in site.categories.releases %} +
    +{% include news_item.html %} +
    +{% endfor %} +
    +
    From 5ff0f12628ec4d29f72d3abb228f322215285272 Mon Sep 17 00:00:00 2001 From: Coby Chapple Date: Mon, 8 Jul 2013 15:21:16 +0100 Subject: [PATCH 27/33] permalink --- site/_layouts/news_item.html | 5 ++--- site/css/style.css | 9 --------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/site/_layouts/news_item.html b/site/_layouts/news_item.html index 424dad65..d5ae1099 100644 --- a/site/_layouts/news_item.html +++ b/site/_layouts/news_item.html @@ -6,9 +6,8 @@ layout: news

    - - {{ page.title }} - + {{ page.title }} +

    {{ content }} diff --git a/site/css/style.css b/site/css/style.css index ea2110aa..9d886853 100644 --- a/site/css/style.css +++ b/site/css/style.css @@ -527,15 +527,6 @@ body > footer a:hover img { padding: 40px; } -.news .post.single { - padding-top: 10px; -} - -.news .news-listing h2 { - margin: 0; - padding-top: 10px; - border-top: rgba(220, 220, 220, 0.5) 1px solid; -} .news .listing h2 { margin-top: 0; From 1a7bbcaafca57cd22ce38927fe6541cf7d3cb95d Mon Sep 17 00:00:00 2001 From: Coby Chapple Date: Mon, 8 Jul 2013 15:52:44 +0100 Subject: [PATCH 28/33] reuse existing article and aside styles, reducing nested markup --- site/_includes/news_item.html | 4 +- site/_layouts/news.html | 4 +- site/_layouts/news_item.html | 33 +++++----- site/css/style.css | 112 ++++++++++------------------------ site/news/index.md | 9 +-- site/news/releases/index.md | 7 +-- 6 files changed, 51 insertions(+), 118 deletions(-) diff --git a/site/_includes/news_item.html b/site/_includes/news_item.html index 61a60741..70069dea 100644 --- a/site/_includes/news_item.html +++ b/site/_includes/news_item.html @@ -1,4 +1,4 @@ -

    +
    + diff --git a/site/_layouts/news.html b/site/_layouts/news.html index e4830af5..8f7945f3 100644 --- a/site/_layouts/news.html +++ b/site/_layouts/news.html @@ -8,9 +8,7 @@ layout: default {% include news_contents_mobile.html %}
    -
    - {{ content }} -
    + {{ content }}
    {% include news_contents.html %} diff --git a/site/_layouts/news_item.html b/site/_layouts/news_item.html index d5ae1099..9fc19f17 100644 --- a/site/_layouts/news_item.html +++ b/site/_layouts/news_item.html @@ -2,22 +2,17 @@ layout: news --- -
    -
    -
    -

    - {{ page.title }} - -

    -

    - {{ content }} -

    -

    - Posted on {{ page.date | date_to_string }} - by @{{ page.author }}, - filed in {{ page.categories | array_to_sentence_string }} -

    -
    -
    -
    -
    +
    +

    + {{ page.title }} + +

    +

    + {{ content }} +

    +

    + Posted on {{ page.date | date_to_string }} + by @{{ page.author }}, + filed in {{ page.categories | array_to_sentence_string }} +

    +
    diff --git a/site/css/style.css b/site/css/style.css index 9d886853..700f7ca4 100644 --- a/site/css/style.css +++ b/site/css/style.css @@ -359,40 +359,38 @@ body > footer a:hover img { } } -/* Documentation */ +/* Article - Used for both docs and news */ -.docs .content { - padding: 0; -} -.docs article { +article { background: #444; border-radius: 10px; padding: 20px; margin: 0 10px; box-shadow: 0 3px 10px rgba(0,0,0,.1); - min-height: 800px; font-size: 16px; } @media (max-width: 568px){ - .docs article { + article { margin: 0; } } @media (min-width: 768px){ - .docs article { + article { padding: 40px 40px 30px; font-size: 21px; } } -.docs aside { +/* Right-side nav - used by both docs and news */ + +aside { padding-top: 30px; } -.docs aside h4 { +aside h4 { text-transform: uppercase; font-size: 14px; font-weight: 700; @@ -402,20 +400,24 @@ body > footer a:hover img { border-bottom: 1px solid #c00; } -.docs aside ul { +aside ul { padding-left: 0; } -.docs aside li { +aside ul:first-child { + margin-top: 0; +} + +aside li { list-style-type: none; } -.docs aside li a { +aside li a { font-size: 16px; position: relative } -.docs aside li.current a:before { +aside li.current a:before { content: ""; border-color: transparent transparent transparent #444; border-style: solid; @@ -427,6 +429,16 @@ body > footer a:hover img { left: -30px; } +/* Documentation */ + +.docs article { + min-height: 800px; +} + +.docs .content { + padding: 0; +} + .section-nav { text-align: center; padding-top: 40px; @@ -501,82 +513,20 @@ body > footer a:hover img { /* News */ -.news .entry { - background: #444; - border-radius: 10px; - padding: 20px; - margin: 0 10px; - box-shadow: 0 3px 10px rgba(0,0,0,.1); - font-size: 16px; -} - -@media (max-width: 568px){ - .news .entry { - margin: 0 0 20px 0; - } -} - -@media (min-width: 768px){ - .news .entry { - font-size: 21px; - margin-bottom: 20px; - } -} - -.news .post { - padding: 40px; -} - - -.news .listing h2 { +article h2:first-child { margin-top: 0; } +.news article { + margin-bottom: 20px; +} + .news .post-details { padding: 0; font-size: 0.8em; color: gray; } -.news aside { - padding-left: 20px; -} - -.news aside h4 { - text-transform: uppercase; - font-size: 14px; - font-weight: 700; - padding: 0 0 10px 29px; - margin-left: -29px; - display: inline-block; - border-bottom: 1px solid #c00; -} - -.news aside ul { - padding-left: 0; -} - -.news aside li { - list-style-type: none; -} - -.news aside li a { - font-size: 16px; - position: relative -} - -.news aside li.current a:before { - content: ""; - border-color: transparent transparent transparent #444; - border-style: solid; - border-width: 10px; - width: 0; - height: 0; - position: absolute; - top: 0; - left: -30px; -} - /* Code Highlighting */ diff --git a/site/news/index.md b/site/news/index.md index d9f91f46..94139fc0 100644 --- a/site/news/index.md +++ b/site/news/index.md @@ -5,11 +5,6 @@ permalink: /news/ author: all --- -
    - {% for post in site.posts %} -
    +{% for post in site.posts %} {% include news_item.html %} -
    - {% endfor %} -
    -
    +{% endfor %} diff --git a/site/news/releases/index.md b/site/news/releases/index.md index d3f6d98b..08349916 100644 --- a/site/news/releases/index.md +++ b/site/news/releases/index.md @@ -5,11 +5,6 @@ permalink: /news/releases/ author: all --- -
    {% for post in site.categories.releases %} -
    -{% include news_item.html %} -
    + {% include news_item.html %} {% endfor %} -
    -
    From f4580fb40c5cec9e41dc4bb8f17d58b8092ceaf3 Mon Sep 17 00:00:00 2001 From: Coby Chapple Date: Mon, 8 Jul 2013 16:36:07 +0100 Subject: [PATCH 29/33] tart up the post meta info a little bit --- site/_includes/news_item.html | 19 +++-- site/_layouts/news_item.html | 21 +++-- ...-06-jekyll-1-dot-0-dot-0-released.markdown | 4 +- ...-08-jekyll-1-dot-0-dot-1-released.markdown | 6 +- ...-12-jekyll-1-dot-0-dot-2-released.markdown | 6 +- ...-07-jekyll-1-dot-0-dot-3-released.markdown | 6 +- site/css/style.css | 81 ++++++++++++++++++- site/news/releases/index.md | 2 +- 8 files changed, 118 insertions(+), 27 deletions(-) diff --git a/site/_includes/news_item.html b/site/_includes/news_item.html index 70069dea..e09e162f 100644 --- a/site/_includes/news_item.html +++ b/site/_includes/news_item.html @@ -4,12 +4,21 @@ {{ post.title }} + + {% for category in post.categories %} + {{ category }} + {% endfor %} + +
    + + {{ post.date | date_to_string }} + + + + {{ post.author }} + +

    {{ post.content }}

    -

    - Posted on {{ post.date | date_to_string }} - by @{{ post.author }}, - filed in {{ post.categories | array_to_sentence_string }} -

    diff --git a/site/_layouts/news_item.html b/site/_layouts/news_item.html index 9fc19f17..b0645320 100644 --- a/site/_layouts/news_item.html +++ b/site/_layouts/news_item.html @@ -7,12 +7,21 @@ layout: news {{ page.title }} + + {% for category in page.categories %} + {{ category }} + {% endfor %} + +
    + + {{ page.date | date_to_string }} + + + + {{ page.author }} + +

    - {{ content }} -

    -

    - Posted on {{ page.date | date_to_string }} - by @{{ page.author }}, - filed in {{ page.categories | array_to_sentence_string }} + {{ content }}

    diff --git a/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown b/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown index 2120a3b2..2be809f2 100644 --- a/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown +++ b/site/_posts/2013-05-06-jekyll-1-dot-0-dot-0-released.markdown @@ -4,7 +4,7 @@ title: "Jekyll 1.0.0 Released" date: "2013-05-06 02:12:52 +0200" author: parkr version: 1.0.0 -categories: [releases, general] +categories: [release] --- Hey! After many months of hard works by Jekyll's contributors, we're excited @@ -17,7 +17,7 @@ examples and for compiling this list): - Automatically generated post excerpts ([example](https://gist.github.com/benbalter/5555369)) - Save and preview drafts before publishing ([example](https://gist.github.com/benbalter/5555992)) -_(Take a look at the [Upgrading][] page in the docs for more detailed information.)_ +Take a look at the [Upgrading][] page in the docs for more detailed information. [history]: /docs/history/#100__20130506 [Upgrading]: /docs/upgrading/ diff --git a/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown b/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown index 9c618800..8ec618b4 100644 --- a/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown +++ b/site/_posts/2013-05-08-jekyll-1-dot-0-dot-1-released.markdown @@ -4,11 +4,9 @@ title: "Jekyll 1.0.1 Released" date: "2013-05-08 23:46:11 +0200" author: parkr version: 1.0.1 -categories: [releases, general] +categories: [release] --- -_(Take a look at the [History][] page in the docs for more detailed information.)_ - Hot on the trails of v1.0, v1.0.1 is out! Here are the highlights: * Add newer `language-` class name prefix to code blocks ([#1037][]) @@ -19,6 +17,8 @@ Hot on the trails of v1.0, v1.0.1 is out! Here are the highlights: * Don't print deprecation warning when no arguments are specified. ([#1041][]) * Add missing `
    ` to site template used by `new` subcommand, fixed typos in code ([#1032][]) +See the [History][] page for more information on this release. + {% assign issue_numbers = "1037|1040|1048|1053|1045|1041|1032" | split: "|" %} {% for issue in issue_numbers %} [#{{ issue }}]: https://github.com/mojombo/jekyll/issues/{{ issue }} diff --git a/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown b/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown index c9202035..658bc6be 100644 --- a/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown +++ b/site/_posts/2013-05-12-jekyll-1-dot-0-dot-2-released.markdown @@ -4,11 +4,9 @@ title: "Jekyll 1.0.2 Released" date: "2013-05-12 14:45:00 +0200" author: parkr version: 1.0.2 -categories: [releases, general] +categories: [release] --- -_(Take a look at the [History][] page in the docs for more detailed information.)_ - v1.0.2 has some key bugfixes that optionally restore some behaviour from pre-1.0 releases, and fix some other annoying bugs: @@ -20,6 +18,8 @@ releases, and fix some other annoying bugs: * Add a `data-lang=""` attribute to Redcarpet code blocks ([#1066][]) * Catching that Redcarpet gem isn't installed ([#1059][]) +See the [History][] page for more information on this release. + {% assign issue_numbers = "1059|1061|1066|1067|1078|1081|1084" | split: "|" %} {% for issue in issue_numbers %} [#{{ issue }}]: https://github.com/mojombo/jekyll/issues/{{ issue }} diff --git a/site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown b/site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown index 8297b089..39c0c6ba 100644 --- a/site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown +++ b/site/_posts/2013-06-07-jekyll-1-dot-0-dot-3-released.markdown @@ -4,11 +4,9 @@ title: "Jekyll 1.0.3 Released" date: "2013-06-07 21:02:13 +0200" author: parkr version: 1.0.3 -categories: [releases, general] +categories: [release] --- -_(Take a look at the [History][] page in the docs for more detailed information.)_ - v1.0.3 contains some key enhancements and bug fixes: - Fail with non-zero exit code when MaRuKu errors ([#1190][]) or Liquid errors ([#1121][]) @@ -17,6 +15,8 @@ v1.0.3 contains some key enhancements and bug fixes: - Fix compatibility with `exclude` and `include` with pre-1.0 Jekyll ([#1114][]) - Fix pagination issue regarding `File.basename` and `page:num` ([#1063][]) +See the [History][] page for more information on this release. + {% assign issue_numbers = "1190|1121|1189|1115|1114|1063" | split: "|" %} {% for issue in issue_numbers %} [#{{ issue }}]: https://github.com/mojombo/jekyll/issues/{{ issue }} diff --git a/site/css/style.css b/site/css/style.css index 700f7ca4..8e99720d 100644 --- a/site/css/style.css +++ b/site/css/style.css @@ -521,10 +521,83 @@ article h2:first-child { margin-bottom: 20px; } -.news .post-details { - padding: 0; - font-size: 0.8em; - color: gray; +.news .post-meta { + +} + +.post-category, +.post-meta { + display: inline-block; + vertical-align: middle; + font-size: .8em; +} + +.post-category { + display: inline-block; + margin-left: -30px; + padding: 6px 10px 8px; + padding-left: 50px; + border-radius: 0 5px 5px 0; + position: relative; + box-shadow: 0 1px 5px rgba(0, 0, 0, .3), inset 0 1px 0 rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.3); + background: #9e2812; + background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzllMjgxMiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM2ZjBkMGQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); + background: -moz-linear-gradient(top, #9e2812 0%, #6f0d0d 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9e2812), color-stop(100%,#6f0d0d)); + background: -webkit-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background: -o-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background: -ms-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background: linear-gradient(to bottom, #9e2812 0%,#6f0d0d 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9e2812', endColorstr='#6f0d0d',GradientType=0 ); +} + +.label { + float: left; + text-transform: uppercase; + font-weight: bold; +} + +@media (max-width: 568px){ + .post-category { + margin-right: -30px; + } +} + +@media (min-width: 768px){ + .post-category { + margin-left: -50px; + } +} + +.post-category:before { + content: ""; + position: absolute; + top: -10px; + left: 0px; + border-color: transparent #6f0d0d #6f0d0d transparent; + border-style: solid; + border-width: 5px; + width: 0; + height: 0; +} + +.avatar { + width: 24px; + height: 24px; + border-radius: 3px; + display: inline-block; + vertical-align: middle; +} + +.post-meta { + padding: 5px 0; + color: #aaa; + font-weight: 600; +} + +.post-date, +.post-author { + margin-left: 10px; } /* Code Highlighting */ diff --git a/site/news/releases/index.md b/site/news/releases/index.md index 08349916..153d022c 100644 --- a/site/news/releases/index.md +++ b/site/news/releases/index.md @@ -5,6 +5,6 @@ permalink: /news/releases/ author: all --- -{% for post in site.categories.releases %} +{% for post in site.categories.release %} {% include news_item.html %} {% endfor %} From 65a3195a5dc58c4245168006aa1fa66864bff5a2 Mon Sep 17 00:00:00 2001 From: Coby Chapple Date: Mon, 8 Jul 2013 16:44:44 +0100 Subject: [PATCH 30/33] category label -> blue --- site/css/style.css | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/site/css/style.css b/site/css/style.css index 8e99720d..0f4914aa 100644 --- a/site/css/style.css +++ b/site/css/style.css @@ -540,21 +540,22 @@ article h2:first-child { border-radius: 0 5px 5px 0; position: relative; box-shadow: 0 1px 5px rgba(0, 0, 0, .3), inset 0 1px 0 rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.3); - background: #9e2812; - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzllMjgxMiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM2ZjBkMGQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #9e2812 0%, #6f0d0d 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9e2812), color-stop(100%,#6f0d0d)); - background: -webkit-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); - background: -o-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); - background: -ms-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); - background: linear-gradient(to bottom, #9e2812 0%,#6f0d0d 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9e2812', endColorstr='#6f0d0d',GradientType=0 ); + background: #0389aa; + background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAzODlhYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDYxN2YiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); + background: -moz-linear-gradient(top, #0389aa 0%, #00617f 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#0389aa), color-stop(100%,#00617f)); + background: -webkit-linear-gradient(top, #0389aa 0%,#00617f 100%); + background: -o-linear-gradient(top, #0389aa 0%,#00617f 100%); + background: -ms-linear-gradient(top, #0389aa 0%,#00617f 100%); + background: linear-gradient(to bottom, #0389aa 0%,#00617f 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0389aa', endColorstr='#00617f',GradientType=0 ); } .label { float: left; text-transform: uppercase; font-weight: bold; + text-shadow: 0 -1px 0 rgba(0,0,0,.5); } @media (max-width: 568px){ @@ -574,7 +575,7 @@ article h2:first-child { position: absolute; top: -10px; left: 0px; - border-color: transparent #6f0d0d #6f0d0d transparent; + border-color: transparent #00617f #00617f transparent; border-style: solid; border-width: 5px; width: 0; @@ -593,6 +594,7 @@ article h2:first-child { padding: 5px 0; color: #aaa; font-weight: 600; + text-shadow: 0 -1px 0 #000; } .post-date, From c800e57075f08dee98a4ebb26f446b09d879cf3d Mon Sep 17 00:00:00 2001 From: Coby Chapple Date: Mon, 8 Jul 2013 16:45:26 +0100 Subject: [PATCH 31/33] =?UTF-8?q?sneakily=20join=20up=20articles=20if=20th?= =?UTF-8?q?ere=E2=80=99s=20more=20than=20one=20being=20shown?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site/css/style.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/site/css/style.css b/site/css/style.css index 0f4914aa..0e242f86 100644 --- a/site/css/style.css +++ b/site/css/style.css @@ -602,6 +602,13 @@ article h2:first-child { margin-left: 10px; } +.news article + article { + margin-top: -30px; + border-radius: 0 0 10px 10px; + border-top: 1px solid #555; + box-shadow: 0 -1px 0 #2f2f2f; +} + /* Code Highlighting */ From 08d9f4e8e935a514d6baf546a6609eb22a658316 Mon Sep 17 00:00:00 2001 From: Coby Chapple Date: Mon, 8 Jul 2013 16:46:46 +0100 Subject: [PATCH 32/33] :skull: --- site/css/style.css | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/site/css/style.css b/site/css/style.css index 0e242f86..9747b00f 100644 --- a/site/css/style.css +++ b/site/css/style.css @@ -517,14 +517,6 @@ article h2:first-child { margin-top: 0; } -.news article { - margin-bottom: 20px; -} - -.news .post-meta { - -} - .post-category, .post-meta { display: inline-block; @@ -603,7 +595,7 @@ article h2:first-child { } .news article + article { - margin-top: -30px; + margin-top: -10px; border-radius: 0 0 10px 10px; border-top: 1px solid #555; box-shadow: 0 -1px 0 #2f2f2f; From d5742cf3832f4d9b0acd96bcb1faf9a2159ea898 Mon Sep 17 00:00:00 2001 From: Coby Chapple Date: Mon, 8 Jul 2013 19:06:36 +0100 Subject: [PATCH 33/33] category label -> red --- site/css/style.css | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/site/css/style.css b/site/css/style.css index 9747b00f..0b4d90ed 100644 --- a/site/css/style.css +++ b/site/css/style.css @@ -532,15 +532,15 @@ article h2:first-child { border-radius: 0 5px 5px 0; position: relative; box-shadow: 0 1px 5px rgba(0, 0, 0, .3), inset 0 1px 0 rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.3); - background: #0389aa; - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAzODlhYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDYxN2YiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #0389aa 0%, #00617f 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#0389aa), color-stop(100%,#00617f)); - background: -webkit-linear-gradient(top, #0389aa 0%,#00617f 100%); - background: -o-linear-gradient(top, #0389aa 0%,#00617f 100%); - background: -ms-linear-gradient(top, #0389aa 0%,#00617f 100%); - background: linear-gradient(to bottom, #0389aa 0%,#00617f 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0389aa', endColorstr='#00617f',GradientType=0 ); + background: #9e2812; + background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzllMjgxMiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM2ZjBkMGQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); + background: -moz-linear-gradient(top, #9e2812 0%, #6f0d0d 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9e2812), color-stop(100%,#6f0d0d)); + background: -webkit-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background: -o-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background: -ms-linear-gradient(top, #9e2812 0%,#6f0d0d 100%); + background: linear-gradient(to bottom, #9e2812 0%,#6f0d0d 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9e2812', endColorstr='#6f0d0d',GradientType=0 ); } .label { @@ -567,7 +567,7 @@ article h2:first-child { position: absolute; top: -10px; left: 0px; - border-color: transparent #00617f #00617f transparent; + border-color: transparent #6f0d0d #6f0d0d transparent; border-style: solid; border-width: 5px; width: 0;