Merge pull request #2651 from jekyll/site-on-2-0

site/_config.yml

@@ -1,9 +1,15 @@
 markdown: kramdown
 highlighter: pygments
 relative_permalinks: false
-gauges_id: 503c5af6613f5d0f19000027
 permalink: /news/:year/:month/:day/:title/
 excerpt_separator: noifniof3nioaniof3nioafafinoafnoif
+
+gauges_id: 503c5af6613f5d0f19000027
+google_analytics_id: UA-50755011-1
+
 repository: https://github.com/jekyll/jekyll
 help_url: https://github.com/jekyll/jekyll-help
-google_analytics_id: UA-50755011-1
+
+collections:
+  docs:
+    output: true

site/_includes/docs_option.html

@@ -3,7 +3,7 @@
 {% for item in items %}
   {% assign item_url = item | prepend:"/docs/" | append:"/" %}
 
-  {% for p in site.pages %}
+  {% for p in site.docs %}
     {% if p.url == item_url %}
       <option value="{{ site.url }}{{ p.url }}">{{ p.title }}</option>
     {% endif %}

site/_includes/docs_ul.html

@@ -10,7 +10,7 @@
     {% assign c = "" %}
   {% endif %}
 
-  {% for p in site.pages %}
+  {% for p in site.docs %}
     {% if p.url == item_url %}
       <li class="{{ c }}"><a href="{{ site.url }}{{ p.url }}">{{ p.title }}</a></li>
     {% endif %}

site/css/screen.css

@@ -1,31 +0,0 @@
----
----
-
-{% capture screen %}
-/*                *\
- * $normalize.css *
-\*                */
-{% include css/normalize.css %}
-/*                *\
- * $gridism.css   *
-\*                */
-{% include css/gridism.css %}
-/*                *\
- * $style.css     *
-\*                */
-{% include css/style.css %}
-/*                *\
- * $pygments.css  *
-\*                */
-{% include css/pygments.css %}
-/*                *\
- * $font-awesome.css  *
-\*                */
-{% include css/font-awesome.css %}
-{% endcapture %}
-
-{% if site.GH_ENV %}
-  {{ screen | strip_newlines | remove: '  ' }}
-{% else %}
-  {{ screen }}
-{% endif %}

site/css/screen.scss

@@ -0,0 +1,8 @@
+---
+---
+
+@import "normalize";
+@import "gridism";
+@import "style";
+@import "pygments";
+@import "font-awesome"