Merge pull request #2061 from jekyll/unreleased-features-warnings-on-…

…site Unreleased features warnings on site
jekyll · Feb 20, 2014 · 55059a6 · 55059a6
2 parents e1fa657 + 019b053
commit 55059a6
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 1 deletion.
diff --git 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: 8px;
+  left: 15px;
+  font-size: 38px;
+  font-weight: bold;
+  text-shadow: 0 1px 0 rgba(255,255,255,.25);
+}
+
 /* Responsive tables */
 
 @media (max-width: 768px){

diff --git a/site/docs/assets.md b/site/docs/assets.md
@@ -6,6 +6,14 @@ next_section: migrations
 permalink: /docs/assets/
 ---
 
+<div class="note unreleased">
+  <h5>Sass and CoffeeScript support is currently unreleased.</h5>
+  <p>
+  In order to use this feature, <a href="/docs/installation/#pre-releases">
+  install the latest development version of Jekyll</a>.
+  </p>
+</div>
+
 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:

diff --git a/site/docs/configuration.md b/site/docs/configuration.md
@@ -350,6 +350,14 @@ redcloth:
   hard_breaks: true
 {% endhighlight %}
 
+<div class="note unreleased">
+  <h5>Kramdown as the default is currently unreleased.</h5>
+  <p>
+    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.
+  </p>
+</div>
 
 ## Markdown Options
 

diff --git 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
+## 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
@@ -46,6 +46,12 @@ hazardous. Here’s what to look out for.
   <p>Be aware of these messages if you wish to avoid certain death.</p>
 </div>
 
+<div class="note unreleased">
+  <h5>You'll see this by a feature that hasn't been released</h5>
+  <p>Some pieces of this website are for future versions of Jekyll that
+    are not yet released.</p>
+</div>
+
 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

diff --git a/site/docs/installation.md b/site/docs/installation.md
@@ -55,6 +55,34 @@ community can improve the experience for everyone.
   </p>
 </div>
 
+## 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 %}
+
+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