diff --git a/site/_config.yml b/site/_config.yml index 44c2772e..ebf373ae 100644 --- a/site/_config.yml +++ b/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 diff --git a/site/docs/assets.md b/site/_docs/assets.md similarity index 100% rename from site/docs/assets.md rename to site/_docs/assets.md diff --git a/site/docs/collections.md b/site/_docs/collections.md similarity index 100% rename from site/docs/collections.md rename to site/_docs/collections.md diff --git a/site/docs/configuration.md b/site/_docs/configuration.md similarity index 100% rename from site/docs/configuration.md rename to site/_docs/configuration.md diff --git a/site/docs/continuous-integration.md b/site/_docs/continuous-integration.md similarity index 100% rename from site/docs/continuous-integration.md rename to site/_docs/continuous-integration.md diff --git a/site/docs/contributing.md b/site/_docs/contributing.md similarity index 100% rename from site/docs/contributing.md rename to site/_docs/contributing.md diff --git a/site/docs/datafiles.md b/site/_docs/datafiles.md similarity index 100% rename from site/docs/datafiles.md rename to site/_docs/datafiles.md diff --git a/site/docs/deployment-methods.md b/site/_docs/deployment-methods.md similarity index 100% rename from site/docs/deployment-methods.md rename to site/_docs/deployment-methods.md diff --git a/site/docs/drafts.md b/site/_docs/drafts.md similarity index 100% rename from site/docs/drafts.md rename to site/_docs/drafts.md diff --git a/site/docs/extras.md b/site/_docs/extras.md similarity index 100% rename from site/docs/extras.md rename to site/_docs/extras.md diff --git a/site/docs/frontmatter.md b/site/_docs/frontmatter.md similarity index 100% rename from site/docs/frontmatter.md rename to site/_docs/frontmatter.md diff --git a/site/docs/github-pages.md b/site/_docs/github-pages.md similarity index 100% rename from site/docs/github-pages.md rename to site/_docs/github-pages.md diff --git a/site/docs/history.md b/site/_docs/history.md similarity index 100% rename from site/docs/history.md rename to site/_docs/history.md diff --git a/site/docs/index.md b/site/_docs/index.md similarity index 100% rename from site/docs/index.md rename to site/_docs/index.md diff --git a/site/docs/installation.md b/site/_docs/installation.md similarity index 100% rename from site/docs/installation.md rename to site/_docs/installation.md diff --git a/site/docs/migrations.md b/site/_docs/migrations.md similarity index 100% rename from site/docs/migrations.md rename to site/_docs/migrations.md diff --git a/site/docs/pages.md b/site/_docs/pages.md similarity index 100% rename from site/docs/pages.md rename to site/_docs/pages.md diff --git a/site/docs/pagination.md b/site/_docs/pagination.md similarity index 100% rename from site/docs/pagination.md rename to site/_docs/pagination.md diff --git a/site/docs/permalinks.md b/site/_docs/permalinks.md similarity index 100% rename from site/docs/permalinks.md rename to site/_docs/permalinks.md diff --git a/site/docs/plugins.md b/site/_docs/plugins.md similarity index 100% rename from site/docs/plugins.md rename to site/_docs/plugins.md diff --git a/site/docs/posts.md b/site/_docs/posts.md similarity index 100% rename from site/docs/posts.md rename to site/_docs/posts.md diff --git a/site/docs/quickstart.md b/site/_docs/quickstart.md similarity index 100% rename from site/docs/quickstart.md rename to site/_docs/quickstart.md diff --git a/site/docs/resources.md b/site/_docs/resources.md similarity index 100% rename from site/docs/resources.md rename to site/_docs/resources.md diff --git a/site/docs/sites.md b/site/_docs/sites.md similarity index 100% rename from site/docs/sites.md rename to site/_docs/sites.md diff --git a/site/docs/structure.md b/site/_docs/structure.md similarity index 100% rename from site/docs/structure.md rename to site/_docs/structure.md diff --git a/site/docs/templates.md b/site/_docs/templates.md similarity index 100% rename from site/docs/templates.md rename to site/_docs/templates.md diff --git a/site/docs/troubleshooting.md b/site/_docs/troubleshooting.md similarity index 100% rename from site/docs/troubleshooting.md rename to site/_docs/troubleshooting.md diff --git a/site/docs/upgrading.md b/site/_docs/upgrading.md similarity index 100% rename from site/docs/upgrading.md rename to site/_docs/upgrading.md diff --git a/site/docs/usage.md b/site/_docs/usage.md similarity index 100% rename from site/docs/usage.md rename to site/_docs/usage.md diff --git a/site/docs/variables.md b/site/_docs/variables.md similarity index 100% rename from site/docs/variables.md rename to site/_docs/variables.md diff --git a/site/docs/windows.md b/site/_docs/windows.md similarity index 100% rename from site/docs/windows.md rename to site/_docs/windows.md diff --git a/site/_includes/docs_option.html b/site/_includes/docs_option.html index 57b76e2d..c2593971 100644 --- a/site/_includes/docs_option.html +++ b/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 %} {% endif %} diff --git a/site/_includes/docs_ul.html b/site/_includes/docs_ul.html index b778df17..366abe9d 100644 --- a/site/_includes/docs_ul.html +++ b/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 %}
  • {{ p.title }}
    • {% endif %} diff --git a/site/_includes/css/font-awesome.css b/site/_sass/_font-awesome.scss similarity index 100% rename from site/_includes/css/font-awesome.css rename to site/_sass/_font-awesome.scss diff --git a/site/_includes/css/gridism.css b/site/_sass/_gridism.scss similarity index 100% rename from site/_includes/css/gridism.css rename to site/_sass/_gridism.scss diff --git a/site/_includes/css/normalize.css b/site/_sass/_normalize.scss similarity index 100% rename from site/_includes/css/normalize.css rename to site/_sass/_normalize.scss diff --git a/site/_includes/css/pygments.css b/site/_sass/_pygments.scss similarity index 100% rename from site/_includes/css/pygments.css rename to site/_sass/_pygments.scss diff --git a/site/_includes/css/style.css b/site/_sass/_style.scss similarity index 100% rename from site/_includes/css/style.css rename to site/_sass/_style.scss diff --git a/site/css/screen.css b/site/css/screen.css deleted file mode 100644 index c49c94af..00000000 --- a/site/css/screen.css +++ /dev/null @@ -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 %} diff --git a/site/css/screen.scss b/site/css/screen.scss new file mode 100644 index 00000000..bca8c2bb --- /dev/null +++ b/site/css/screen.scss @@ -0,0 +1,8 @@ +--- +--- + +@import "normalize"; +@import "gridism"; +@import "style"; +@import "pygments"; +@import "font-awesome"