Merge pull request #36 from grain-lang/spring-sprucing

Spring sprucing

Author: ospencer

.gitignore

@@ -5,5 +5,5 @@ db.json
 node_modules/
 .deploy*/
 _multiconfig.yml
-docs/
-guide/
+/docs
+/guide

docs_config.yml

@@ -18,21 +18,32 @@ permalink: :year/:month/:day/:title/
 permalink_defaults:
 
 # Directory
-source_dir: docs_source
+source_dir: src
 public_dir: docs
 tag_dir: tags
 archive_dir: archives
 category_dir: categories
 code_dir: downloads/code
 i18n_dir: :lang
-skip_render:
+pretty_urls:
+  trailing_html: false
 
 project: docs
 sidebar_title: The Grain Docs
 docs_groups:
   null:
     - index
-    - getting_started
+    - getting_grain
+    - editor_setup
+  The Guide:
+    - guide/hello_world
+    - guide/basics
+    - guide/boxes
+  The Docs:
+    - intro
+  Standard Library:
+    - stdlib/list
+    - stdlib/DOM
   Language Constructs:
     - constructs/overview
     - constructs/bindings
@@ -44,9 +55,6 @@ docs_groups:
     - constructs/conditionals
     - constructs/types
     - constructs/pattern_matching
-  Standard Library:
-    - stdlib/list
-    - stdlib/DOM
 # Writing
 new_post_name: :title.md # File name of new posts
 default_layout: post
@@ -95,3 +103,8 @@ theme: grain
 ## Docs: https://hexo.io/docs/deployment.html
 deploy:
   type:
+
+server:
+  serveStatic:
+    extensions:
+      - html

docs_source/index.md

@@ -43,8 +43,8 @@
     <nav id="nav">
       <a href="/"><img class="nav-logo" src="/images/grain_logo_white.svg"></a>
       <div class="nav-links">
-        <a href="/guide" class="nav-link heading">Guide</a>
-        <a href="/docs" class="nav-link heading">Documentation</a>
+        <a href="/docs" class="nav-link heading">Guide</a>
+        <a href="/docs/intro" class="nav-link heading">Documentation</a>
         <a href="https://github.com/grain-lang/grain/graphs/contributors" class="nav-link heading">Community</a>
       </div>
       <div class="nav-social-links">
@@ -56,7 +56,7 @@
       <img class="brand" src="/images/grain_shorthand_white.svg">
       <h1 class="hero-heading heading">A modern web staple.</h1>
       <h2 class="hero-heading2 heading">Grain is a new language that puts academic language features to work.</h2>
-      <a href="/guide" class="button hero-cta">Let's Go</a>
+      <a href="/docs" class="button hero-cta">Let's Go</a>
     </div>
   </section>
   <section class="blurbs">
@@ -103,15 +103,15 @@ <h2 class="contribute-header heading">
   <section class="banner">
     <h2 class="heading banner-header">Build it with Grain.</h2>
     <p class="banner-message">Start a project now and help shape the future of Grain.</p>
-    <a href="/guide" class="banner-cta button">Let's Go</a>
+    <a href="/docs" class="banner-cta button">Let's Go</a>
   </section>
   <footer class="footer">
     <img src="/images/grain_shorthand_color.svg" alt="Grain shorthand" class="footer-logo">
     <div class="footer-links">
       <p class="footer-link-header">For Developers</p>
       <ul>
-        <li><a href="/guide">Guide</a></li>
-        <li><a href="/docs">Documentation</a></li>
+        <li><a href="/docs">Guide</a></li>
+        <li><a href="/docs/intro">Documentation</a></li>
         <li><a href="https://github.com/grain-lang/grain/graphs/contributors">Community</a></li>
       </ul>
     </div>