From cf25da9431f7de7af632ac2dcfa4ad4d686432fe Mon Sep 17 00:00:00 2001 From: Coby Chapple Date: Mon, 8 Jul 2013 14:28:03 +0100 Subject: [PATCH 1/9] 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 2/9] 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 3/9] 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 4/9] 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 5/9] 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 6/9] 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 7/9] =?UTF-8?q?sneakily=20join=20up=20articles=20if=20ther?= =?UTF-8?q?e=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 8/9] :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 9/9] 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;