From d203554e849862cdf6d10c83522f9a3c210f1564 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 17 Feb 2014 15:58:55 -0500 Subject: [PATCH 1/9] Add "unreleased" type note --- site/_includes/css/style.css | 28 ++++++++++++++++++++++++++++ site/docs/index.md | 8 +++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/site/_includes/css/style.css b/site/_includes/css/style.css index 6b0339ea..b27fdb58 100644 --- a/site/_includes/css/style.css +++ b/site/_includes/css/style.css @@ -904,6 +904,19 @@ code.option, code.flag, code.filter, code.output { filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9e2812', endColorstr='#6f0d0d',GradientType=0 ); } +.unreleased { + background: rgb(205,146,57); /* Old browsers */ + /* IE9 SVG, needs conditional override of 'filter' to 'none' */ + background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2NkOTIzOSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNhMjc1MjgiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); + background: -moz-linear-gradient(top, rgba(205,146,57,1) 0%, rgba(162,117,40,1) 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(205,146,57,1)), color-stop(100%,rgba(162,117,40,1))); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* IE10+ */ + background: linear-gradient(to bottom, rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cd9239', endColorstr='#a27528',GradientType=0 ); /* IE6-8 */ +} + .info:before { border-color: transparent #00617f #00617f transparent; } @@ -912,6 +925,10 @@ code.option, code.flag, code.filter, code.output { border-color: transparent #6f0d0d #6f0d0d transparent; } +.unreleased:before { + border-color: transparent #664719 #664719 transparent; +} + .note:after { content: "★"; color: #fc0; @@ -945,6 +962,17 @@ code.option, code.flag, code.filter, code.output { text-shadow: 0 -1px 0 rgba(0,0,0,.5); } +.unreleased:after { + content: "⚒"; + color: #2b2a12; + position: absolute; + top: 12px; + left: 15px; + font-size: 32px; + font-weight: bold; + text-shadow: 0 -1px 0 rgba(0,0,0,.5); +} + /* Responsive tables */ @media (max-width: 768px){ diff --git a/site/docs/index.md b/site/docs/index.md index 021a7121..8774954b 100644 --- a/site/docs/index.md +++ b/site/docs/index.md @@ -24,7 +24,7 @@ behind [GitHub Pages](http://pages.github.com), which means you can use Jekyll to host your project’s page, blog, or website from GitHub’s servers **for free**. -## ProTips™, Notes, and Warnings +## ProTips™, Notes, Warnings, and Unreleased Features Throughout this guide there are a number of small-but-handy pieces of information that can make using Jekyll easier, more interesting, and less @@ -46,6 +46,12 @@ hazardous. Here’s what to look out for.

Be aware of these messages if you wish to avoid certain death.

+
+
You'll see this by a feature that hasn't been released
+

Some pieces of this website are for future versions of Jekyll that + are not yet released.

+
+ If you come across anything along the way that we haven’t covered, or if you know of a tip you think others would find handy, please [file an issue]({{ site.repository }}/issues/new) and we’ll see about From 5423f02c3cce6e9da52b94b9b6384c3a5c78da8c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 17 Feb 2014 15:59:07 -0500 Subject: [PATCH 2/9] Add "unreleased" note to docs/assets/ --- site/docs/assets.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/site/docs/assets.md b/site/docs/assets.md index 5191dc15..c0f8aa64 100644 --- a/site/docs/assets.md +++ b/site/docs/assets.md @@ -6,6 +6,13 @@ next_section: migrations permalink: /docs/assets/ --- +
+
Sass and CoffeeScript support is currently unreleased.
+

+ In order to use this feature, you must install v2.0.0.alpha.1 or above. +

+
+ Jekyll provides built-in support for Sass and CoffeeScript. In order to use them, create a file with the proper extension name (one of `.sass`, `.scss`, or `.coffee`) and start the file with two lines of triple dashes, like this: From b051936ff48da065ff30a8a8198f86ba1e3746a4 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 17 Feb 2014 15:59:25 -0500 Subject: [PATCH 3/9] Add "unreleased" note to /docs/configuration about kramdown as the new default --- site/docs/configuration.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/site/docs/configuration.md b/site/docs/configuration.md index e2011142..27fee35c 100644 --- a/site/docs/configuration.md +++ b/site/docs/configuration.md @@ -350,6 +350,14 @@ redcloth: hard_breaks: true {% endhighlight %} +
+
Kramdown as the default is currently unreleased.
+

+ In v2.0.0.alpha.1 and above, we've deprecated Maruku and will default to + Kramdown instead of Maruku. All versions below this will use Maruku as the + default. +

+
## Markdown Options From e491afe29419d1a20b11332d8cd5fda0e499e99d Mon Sep 17 00:00:00 2001 From: Troy Swanson Date: Mon, 17 Feb 2014 16:45:35 -0500 Subject: [PATCH 4/9] Make the icon for the unreleased note brighter --- site/_includes/css/style.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/site/_includes/css/style.css b/site/_includes/css/style.css index b27fdb58..0a5fb437 100644 --- a/site/_includes/css/style.css +++ b/site/_includes/css/style.css @@ -964,11 +964,11 @@ code.option, code.flag, code.filter, code.output { .unreleased:after { content: "⚒"; - color: #2b2a12; + color: #ffe9c3; position: absolute; - top: 12px; - left: 15px; - font-size: 32px; + top: 8px; + left: 14px; + font-size: 38px; font-weight: bold; text-shadow: 0 -1px 0 rgba(0,0,0,.5); } From aa801efce95d1e9e1026e65b357c9bebd96a8f40 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 19 Feb 2014 23:11:37 -0500 Subject: [PATCH 5/9] Make the unreleased note type icon dark. Props @cobyism --- site/_includes/css/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/_includes/css/style.css b/site/_includes/css/style.css index 0a5fb437..7d261f50 100644 --- a/site/_includes/css/style.css +++ b/site/_includes/css/style.css @@ -964,13 +964,13 @@ code.option, code.flag, code.filter, code.output { .unreleased:after { content: "⚒"; - color: #ffe9c3; + color: #2b2a12; position: absolute; top: 8px; - left: 14px; + left: 15px; font-size: 38px; font-weight: bold; - text-shadow: 0 -1px 0 rgba(0,0,0,.5); + text-shadow: 0 1px 0 rgba(255,255,255,.25); } /* Responsive tables */ From a0017b5c72f4d8d53f2c5cd62acd40f9fec10d7b Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 19 Feb 2014 23:12:00 -0500 Subject: [PATCH 6/9] Add verbiage around installing pre-releases of jekyll. --- site/docs/installation.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/site/docs/installation.md b/site/docs/installation.md index 7e4bd570..d58a04be 100644 --- a/site/docs/installation.md +++ b/site/docs/installation.md @@ -55,6 +55,22 @@ community can improve the experience for everyone.

+## Pre-releases + +In order to install a pre-release, make sure you have all the requirements +installed properly and run: + +{% highlight bash %} +gem install jekyll --pre +{% endhighlight %} + +This will install the latest pre-release. If you want a particular pre-release, +use the `-v` switch to indicate the version you'd like to install: + +{% highlight bash %} +gem install jekyll -v '2.0.0.alpha.1' +{% endhighlight %} + ## Optional Extras There are a number of (optional) extra features that Jekyll supports that you From f5c76e2253a7e3fa89b2c4a2c35607f6107402d1 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 19 Feb 2014 23:12:54 -0500 Subject: [PATCH 7/9] Shorten header for example of each note type. Props @cobyism --- site/docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/docs/index.md b/site/docs/index.md index 8774954b..44a00b43 100644 --- a/site/docs/index.md +++ b/site/docs/index.md @@ -24,7 +24,7 @@ behind [GitHub Pages](http://pages.github.com), which means you can use Jekyll to host your project’s page, blog, or website from GitHub’s servers **for free**. -## ProTips™, Notes, Warnings, and Unreleased Features +## Helpful Hints Throughout this guide there are a number of small-but-handy pieces of information that can make using Jekyll easier, more interesting, and less From 768a47dcfb0bb0b48010b0c69178a10ce19375c4 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 19 Feb 2014 23:17:50 -0500 Subject: [PATCH 8/9] Be a bit more vague about when features are available in pre-releases. --- site/docs/assets.md | 3 ++- site/docs/configuration.md | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/site/docs/assets.md b/site/docs/assets.md index c0f8aa64..95a4cc65 100644 --- a/site/docs/assets.md +++ b/site/docs/assets.md @@ -9,7 +9,8 @@ permalink: /docs/assets/
Sass and CoffeeScript support is currently unreleased.

- In order to use this feature, you must install v2.0.0.alpha.1 or above. + In order to use this feature, + install the latest development version of Jekyll.

diff --git a/site/docs/configuration.md b/site/docs/configuration.md index 27fee35c..70cb93aa 100644 --- a/site/docs/configuration.md +++ b/site/docs/configuration.md @@ -353,7 +353,7 @@ redcloth:
Kramdown as the default is currently unreleased.

- In v2.0.0.alpha.1 and above, we've deprecated Maruku and will default to + In the latest development releases, we've deprecated Maruku and will default to Kramdown instead of Maruku. All versions below this will use Maruku as the default.

From 019b0537f6b60929c4b1806a1db24a6ab3bd3393 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 19 Feb 2014 23:24:12 -0500 Subject: [PATCH 9/9] Added docs for installing from master. --- site/docs/installation.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/site/docs/installation.md b/site/docs/installation.md index d58a04be..4f566ccc 100644 --- a/site/docs/installation.md +++ b/site/docs/installation.md @@ -71,6 +71,18 @@ use the `-v` switch to indicate the version you'd like to install: gem install jekyll -v '2.0.0.alpha.1' {% endhighlight %} +If you'd like to install a development version of Jekyll, the process is a bit +more involved. This gives you the advantage of having the latest and greatest, +but may be unstable. + +{% highlight bash %} +$ git clone git://github.com/jekyll/jekyll.git +$ cd jekyll +$ script/bootstrap +$ bundle exec rake build +$ ls pkg/*.gem | head -n 1 | xargs gem install -l +{% endhighlight %} + ## Optional Extras There are a number of (optional) extra features that Jekyll supports that you