json-api · wvteijlingen · Mar 27, 2015 · Mar 27, 2015 · Mar 29, 2015 · Mar 30, 2015
diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,7 @@ gem "rake", "~> 10.0"
 gem "jekyll", "~> 1.0"
 gem "redcarpet", "~> 2.2"
 gem "rb-fsevent", "~> 0.9"
-gem "compass", "~> 0.12"
-gem "sass", "~> 3.2"
+gem "compass", "~> 1.0"
+gem "sass", "~> 3.4"
 gem "launchy", "~> 2.3"
 gem "redcard", "~> 1.0"
diff --git a/_config.yml b/_config.yml
@@ -17,8 +17,8 @@ pygments: false
 port: 9876
 
 navigation:
-- title: Format
-  url: /format/
+- title: Specification
+  url: /specification/
 - title: Extensions
   url: /extensions/
 - title: Recommendations
@@ -29,3 +29,9 @@ navigation:
   url: /faq/
 - title: About
   url: /about/
+
+quicklinks:
+- title: View the specification
+  url: /specification/
+- title: Contribute on Github
+  url: https://github.com/json-api/json-api
diff --git a/_includes/footer.html b/_includes/footer.html
diff --git a/_includes/header.html b/_includes/header.html
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -2,38 +2,77 @@
 <html>
   <head>
     <meta charset="utf-8">
-
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <!-- Use title if it's in the page YAML frontmatter -->
-    <title>JSON API :: {{ page..title }}</title>
+    <title>JSON:API - {{ page.title }}</title>
 
-    <link href='http://fonts.googleapis.com/css?family=Titillium+Web:400,600,700,900' rel='stylesheet' type='text/css'>
+    <link href='http://fonts.googleapis.com/css?family=Titillium+Web:400,300,600' rel='stylesheet' type='text/css'>
     <link href="/stylesheets/normalize.css" media="screen" rel="stylesheet" type="text/css" />
     <link href="/stylesheets/highlight.css" media="screen" rel="stylesheet" type="text/css" />
     <link href="/stylesheets/all.css" media="screen" rel="stylesheet" type="text/css" />
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
     <script src="/javascripts/all.js" type="text/javascript"></script>
     <script src="/javascripts/highlight.pack.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
   </head>
 
   <body>
-    {% include header.html %}
-    <article>
-
-      <section>
-        {% if page.show_masthead %}
-        <div class="masthead">
-          <img src="/images/jsonapi@1.3x.png">
-          <h1>{{ page.title }}</h1>
+     <nav class="site-nav">
+      <ul>
+        {% assign url = page.url|remove:'index.html' %}
+        <li class="logo{% if url == '/' %} active{% endif %}"><a href="/" title="JSON:API"><img src="/images/logo-header.svg"></a></li>
+        {% for link in site.navigation %}
+          <li {% if url == link.url %}class="active"{% endif %}><a href="{{link.url}}" title="{{link.title}}">{{link.title}}</a></li>
+        {% endfor %}
+      </ul>
+    </nav>
+    {% if page.show_masthead %}
+      <header>
+        <div class="content">
+          <h1>JSON:API</h1>
+          <div class="quicklinks">
+            {% for link in site.quicklinks %}
+              <a href="{{link.url}}" title="{{link.title}}">{{link.title}}</a>
+            {% endfor %}
+          </div>
+        </div>
+      </header>
+    {% endif %}
+    <div class="site-wrapper">
+      {% if page.show_sidebar %}
+        <div class="sidebar">
+          <nav class="document-outline" id="document-outline">
+            <h2>{{ page.title }}</h2>
+          </nav>
         </div>
-        {% else %}
-        <h1>{{ page.title }}</h1>
-        {% endif %}
-        {{ content }}
-      </section>
-    </article>
-    {% include footer.html %}
+      {% endif %}
+      <div class="content">
+        <section>
+          {{ content }}
+        </section>
+      </div>
+    </div>
+    <footer>
+      <span>Built with <a href="http://jekyllrb.com/">Jekyll</a> and <a href="http://softwaremaniacs.org/soft/highlight/en/">Highlight.js</a></span>
+      <span>Hosted by <a href="http://pages.github.com/">GitHub Pages</a></span>
+      <span>Generated at {{ site.time | date_to_xmlschema }}</span>
+      <span class="social-links">
+        <a class="twitter" href="http://twitter.com/jsonapi"><i class="icon-twitter"></i><span>Twitter</span></a>
+        <a class="github" href="https://github.com/json-api"><i class="icon-github"></i><span>GitHub</span></a>
+        <a class="googleplus" href="https://groups.google.com/forum/?fromgroups#!forum/jsonapi"><i class="icon-gplus"></i><span>Google</span></a>
+      </span>
+    </footer>
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+      ga('create', 'UA-40609539-1', 'jsonapi.org');
+      ga('send', 'pageview');
+
+    </script>
   </body>
 </html>
diff --git a/design/jsonapi.sketch b/design/jsonapi.sketch
diff --git a/design/jsonapi.sketch/Data b/design/jsonapi.sketch/Data
diff --git a/design/jsonapi.sketch/metadata b/design/jsonapi.sketch/metadata
diff --git a/design/jsonapi.sketch/version b/design/jsonapi.sketch/version
diff --git a/extensions/bulk/index.md b/extensions/bulk/index.md
@@ -11,12 +11,12 @@ It provides support for performing multiple operations in a request,
 including adding and removing multiple resources.
 
 Servers and clients **MUST** negotiate support for and use of the Bulk extension
-[as described in the base specification](/format/#extending) using `bulk` as the
+[as described in the base specification](/specification/#extending) using `bulk` as the
 name of the extension.
 
 ## Bulk Operations <a href="#bulk-operations" id="bulk-operations" class="headerlink"></a>
 
-[As mentioned in the base specification](/format/#crud), a request **MUST**
+[As mentioned in the base specification](/specification/#crud), a request **MUST**
 completely succeed or fail (in a single "transaction").
 
 Therefore, any request that involves multiple operations **MUST** only

diff --git a/extensions/index.md b/extensions/index.md
@@ -7,11 +7,11 @@ JSON API can be extended in several ways:
 
 * The `supported-ext` and `ext` media type parameters can be used to negotiate
   support for extensions,
-  [as discussed in the base specification](/format#extending).
+  [as discussed in the base specification](/specification#extending).
   Official and custom extensions to the specification are discussed below.
 
 * Meta information can be included in several places in a document,
-  [as discussed in the base specification](/format/#document-structure-meta).
+  [as discussed in the base specification](/specification/#document-structure-meta).
 
 * A profile can be specified in the top-level `meta` object, as discussed below.
 

diff --git a/extensions/jsonpatch/index.md b/extensions/jsonpatch/index.md
@@ -15,7 +15,7 @@ For the sake of brevity, operatons requested with `PATCH` and conforming
 with JSON Patch will be called "Patch operations".
 
 Servers and clients **MUST** negotiate support for and use of the JSON Patch
-extension [as described in the base specification](/format/#extending) using
+extension [as described in the base specification](/specification/#extending) using
 `jsonpatch` as the name of the extension.
 
 ## Patch Operations <a href="#patch-operations" id="patch-operations" class="headerlink"></a>

diff --git a/faq/index.md b/faq/index.md
@@ -3,13 +3,13 @@ layout: page
 title: Frequently Asked Questions
 ---
 
-### Why is JSON API not versioned? <a href="#why-is-json-api-not-versioned" id="why-is-json-api-not-versioned" class="headerlink"></a>
+## Why is JSON API not versioned? <a href="#why-is-json-api-not-versioned" id="why-is-json-api-not-versioned" class="headerlink"></a>
 
 Once JSON API is stable, it will always be backwards compatible using a _never
 remove, only add_ strategy.
 [#46](https://github.com/json-api/json-api/issues/46)
 
-### Why not use the HAL specification? <a href="#why-not-use-the-hal-specification" id="why-not-use-the-hal-specification" class="headerlink"></a>
+## Why not use the HAL specification? <a href="#why-not-use-the-hal-specification" id="why-not-use-the-hal-specification" class="headerlink"></a>
 
 There are several reasons:
 
@@ -37,7 +37,7 @@ It is extracted from a real-world library already used by a number of projects,
 which has informed both the request/response aspects (absent from HAL) and the
 interchange format itself.
 
-### How to discover resource possible actions? <a href="#how-to-discover-resource-possible-actions" id="how-to-discover-resource-possible-actions" class="headerlink"></a>
+## How to discover resource possible actions? <a href="#how-to-discover-resource-possible-actions" id="how-to-discover-resource-possible-actions" class="headerlink"></a>
 
 You should use the OPTIONS HTTP method to discover what can be done with a
 particular resource. The semantics of the methods returned by OPTIONS is defined
@@ -52,19 +52,19 @@ and capabilities and use the errors response to let users know. This error featu
 is still pending to be included in the standard since is still in
 [discussion](https://github.com/json-api/json-api/issues/7).
 
-### Where's PUT? Can I use method *X* to do *Y*? <a href="#wheres-put" id="wheres-put" class="headerlink"></a>
+## Where's PUT? Can I use method *X* to do *Y*? <a href="#wheres-put" id="wheres-put" class="headerlink"></a>
 
 JSON API does not currently specify the use of the `PUT` method for any purpose.
 
 Servers may complement the base specification by providing extra capabilities and
 alternative ways of requesting certain operations (e.g., resource creation via
 `PUT` in addition to `POST`).
 
-### Is there a JSON Schema describing JSON API? <a href="#is-there-a-json-schema-describing-json-api" id="is-there-a-json-schema-describing-json-api" class="headerlink"></a>
+## Is there a JSON Schema describing JSON API? <a href="#is-there-a-json-schema-describing-json-api" id="is-there-a-json-schema-describing-json-api" class="headerlink"></a>
 
 Not currently, no. JSON Schema cannot fully represent the semantics of JSON API, and so any such schema would be partial anyway.
 
-### Why are resource collections returned as arrays instead of sets keyed by ID?
+## Why are resource collections returned as arrays instead of sets keyed by ID?
 
 A JSON array is naturally ordered while sets require metadata to specify order
 among members. Therefore, arrays allow for more natural sorting by default or
@@ -73,7 +73,7 @@ specified criteria.
 In addition, JSON API allows read-only resources to be returned without IDs,
 which would of course be incompatible with a set keyed by IDs.
 
-### Why are related resources nested in an `included` object in a compound document?
+## Why are related resources nested in an `included` object in a compound document?
 
 Primary resources should be isolated because their order and number is often
 significant. It's necessary to separate primary and related resources by more

diff --git a/images/jsonapi@0.7x.png b/images/jsonapi@0.7x.png
diff --git a/images/jsonapi@1.3x.png b/images/jsonapi@1.3x.png