From 0aff03f8dae210d5ea850c0877f85463d8f794c7 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Wed, 11 Jun 2014 21:58:33 -0700
Subject: [PATCH 01/36] Fixes #77, update sites without search

Sites without search now do not include search.js or lunr.js,
making the javascript for those pages much faster to load.
---
 source/javascripts/all_nosearch.js | 4 ++++
 source/layouts/layout.erb          | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 source/javascripts/all_nosearch.js

diff --git a/source/javascripts/all_nosearch.js b/source/javascripts/all_nosearch.js
new file mode 100644
index 00000000000..4610cabe62d
--- /dev/null
+++ b/source/javascripts/all_nosearch.js
@@ -0,0 +1,4 @@
+//= require_tree ./lib
+//= require_tree ./app
+//= stub ./app/search.js
+//= stub ./lib/lunr.js
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index 1ea9cf1a187..c206e1bd9e3 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -24,7 +24,11 @@ under the License.
     <%= stylesheet_link_tag :screen, media: :screen %>
     <%= stylesheet_link_tag :print, media: :print %>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-    <%= javascript_include_tag  "all" %>
+    <% if current_page.data.search %>
+      <%= javascript_include_tag  "all" %>
+    <% else %>
+      <%= javascript_include_tag  "all_nosearch" %>
+    <% end %>
 
     <% if language_tabs %>
       <script>

From 5a69760f54f69d6b1cf5e76d23dfeb0708baa13a Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Wed, 11 Jun 2014 22:04:08 -0700
Subject: [PATCH 02/36] Remove top border from first h1 of page

---
 source/stylesheets/screen.css.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss
index f760f8f5273..6eec37a04b2 100644
--- a/source/stylesheets/screen.css.scss
+++ b/source/stylesheets/screen.css.scss
@@ -294,6 +294,10 @@ html, body {
       );
     }
 
+    h1:first-child, div:first-child + h1 {
+      border-top-width: 0;
+    }
+
     h2 {
       @extend %header-font;
       font-size: 20px;

From 4d4f6efeb8d036590b5b7584fe8b236ad0aba34e Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Wed, 11 Jun 2014 22:10:31 -0700
Subject: [PATCH 03/36] Fix #75, don't set page hash to undefined

---
 source/javascripts/lib/jquery.tocify.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/source/javascripts/lib/jquery.tocify.js b/source/javascripts/lib/jquery.tocify.js
index d122048c8d6..d32ad7b066b 100644
--- a/source/javascripts/lib/jquery.tocify.js
+++ b/source/javascripts/lib/jquery.tocify.js
@@ -722,12 +722,14 @@
 
                         if(self.options.scrollHistory) {
 
-                            if(window.location.hash !== "#" + anchorText) {
+                            // IF STATEMENT ADDED BY ROBERT
 
-                                if(history.replaceState) { 
+                            if(window.location.hash !== "#" + anchorText && anchorText !== undefined) {
+
+                                if(history.replaceState) {
                                     history.replaceState({}, "", "#" + anchorText);
                                 // provide a fallback
-                                } else { 
+                                } else {
                                     scrollV = document.body.scrollTop;
                                     scrollH = document.body.scrollLeft;
                                     location.hash = "#" + anchorText;

From ec9a68884659d5d080af8465a910c2dc5b16f6a6 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Wed, 11 Jun 2014 23:09:04 -0700
Subject: [PATCH 04/36] Fix bad h1 top border commit

---
 source/stylesheets/screen.css.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss
index 6eec37a04b2..363cf824c44 100644
--- a/source/stylesheets/screen.css.scss
+++ b/source/stylesheets/screen.css.scss
@@ -294,8 +294,10 @@ html, body {
       );
     }
 
-    h1:first-child, div:first-child + h1 {
-      border-top-width: 0;
+    &:first-child {
+      h1:first-child, div:first-child + h1 {
+        border-top-width: 0;
+      }
     }
 
     h2 {

From c2c35cfa253e2f7c12455bb2e1928a0eb1c3859a Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Thu, 12 Jun 2014 00:01:52 -0700
Subject: [PATCH 05/36] Add retracting sidebar for tablets

---
 source/images/navbar.png           | Bin 0 -> 150 bytes
 source/javascripts/app/toc.js      |  14 +++
 source/javascripts/lib/energize.js | 169 +++++++++++++++++++++++++++++
 source/layouts/layout.erb          |   5 +
 source/stylesheets/screen.css.scss |  57 +++++++++-
 source/stylesheets/variables.scss  |   2 +
 6 files changed, 246 insertions(+), 1 deletion(-)
 create mode 100644 source/images/navbar.png
 create mode 100644 source/javascripts/lib/energize.js

diff --git a/source/images/navbar.png b/source/images/navbar.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf80e9bcf5cf4038c05b64500f3150cef2434d4b
GIT binary patch
literal 150
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJSWg$nkO<D?1PNAUTNa6n%m*%A
z`eeUL!u03yetGwelRIa%O-{bHg82mJ)<E0EiUxa}7?y@GRpxF{SyIlzUlHh&&)<K`
xT#Bh#pT*7l5Tkwv+a1Pc{m{N$9rqL&7^L6uh!rtPe+F8_;OXk;vd$@?2>_Y|E}j4Y

literal 0
HcmV?d00001

diff --git a/source/javascripts/app/toc.js b/source/javascripts/app/toc.js
index 3761c2bf38a..60caf7894d4 100644
--- a/source/javascripts/app/toc.js
+++ b/source/javascripts/app/toc.js
@@ -7,6 +7,11 @@
   $(toc);
   $(animate);
 
+  var closeToc = function() {
+    $(".tocify-wrapper").removeClass('open');
+    $("#nav-button").removeClass('open');
+  };
+
   function toc () {
     toc = $("#toc").tocify({
       selectors: 'h1, h2',
@@ -23,6 +28,15 @@
         return element.prop('id');
       }
     }).data('toc-tocify');
+
+    $("#nav-button").click(function() {
+      $(".tocify-wrapper").toggleClass('open');
+      $("#nav-button").toggleClass('open');
+      return false;
+    });
+
+    $(".page-wrapper").click(closeToc);
+    $(".tocify-item").click(closeToc);
   }
 
   // Hack to make already open sections to start opened,
diff --git a/source/javascripts/lib/energize.js b/source/javascripts/lib/energize.js
new file mode 100644
index 00000000000..6798f3c03f3
--- /dev/null
+++ b/source/javascripts/lib/energize.js
@@ -0,0 +1,169 @@
+/**
+ * energize.js v0.1.0
+ *
+ * Speeds up click events on mobile devices.
+ * https://github.com/davidcalhoun/energize.js
+ */
+
+(function() {  // Sandbox
+  /**
+   * Don't add to non-touch devices, which don't need to be sped up
+   */
+  if(!('ontouchstart' in window)) return;
+
+  var lastClick = {},
+      isThresholdReached, touchstart, touchmove, touchend,
+      click, closest;
+  
+  /**
+   * isThresholdReached
+   *
+   * Compare touchstart with touchend xy coordinates,
+   * and only fire simulated click event if the coordinates
+   * are nearby. (don't want clicking to be confused with a swipe)
+   */
+  isThresholdReached = function(startXY, xy) {
+    return Math.abs(startXY[0] - xy[0]) > 5 || Math.abs(startXY[1] - xy[1]) > 5;
+  };
+
+  /**
+   * touchstart
+   *
+   * Save xy coordinates when the user starts touching the screen
+   */
+  touchstart = function(e) {
+    this.startXY = [e.touches[0].clientX, e.touches[0].clientY];
+    this.threshold = false;
+  };
+
+  /**
+   * touchmove
+   *
+   * Check if the user is scrolling past the threshold.
+   * Have to check here because touchend will not always fire
+   * on some tested devices (Kindle Fire?)
+   */
+  touchmove = function(e) {
+    // NOOP if the threshold has already been reached
+    if(this.threshold) return false;
+
+    this.threshold = isThresholdReached(this.startXY, [e.touches[0].clientX, e.touches[0].clientY]);
+  };
+
+  /**
+   * touchend
+   *
+   * If the user didn't scroll past the threshold between
+   * touchstart and touchend, fire a simulated click.
+   *
+   * (This will fire before a native click)
+   */
+  touchend = function(e) {
+    // Don't fire a click if the user scrolled past the threshold
+    if(this.threshold || isThresholdReached(this.startXY, [e.changedTouches[0].clientX, e.changedTouches[0].clientY])) {
+      return;
+    }
+    
+    /**
+     * Create and fire a click event on the target element
+     * https://developer.mozilla.org/en/DOM/event.initMouseEvent
+     */
+    var touch = e.changedTouches[0],
+        evt = document.createEvent('MouseEvents');
+    evt.initMouseEvent('click', true, true, window, 0, touch.screenX, touch.screenY, touch.clientX, touch.clientY, false, false, false, false, 0, null);
+    evt.simulated = true;   // distinguish from a normal (nonsimulated) click
+    e.target.dispatchEvent(evt);
+  };
+  
+  /**
+   * click
+   *
+   * Because we've already fired a click event in touchend,
+   * we need to listed for all native click events here
+   * and suppress them as necessary.
+   */  
+  click = function(e) {
+    /**
+     * Prevent ghost clicks by only allowing clicks we created
+     * in the click event we fired (look for e.simulated)
+     */
+    var time = Date.now(),
+        timeDiff = time - lastClick.time,
+        x = e.clientX,
+        y = e.clientY,
+        xyDiff = [Math.abs(lastClick.x - x), Math.abs(lastClick.y - y)],
+        target = closest(e.target, 'A') || e.target,  // needed for standalone apps
+        nodeName = target.nodeName,
+        isLink = nodeName === 'A',
+        standAlone = window.navigator.standalone && isLink && e.target.getAttribute("href");
+    
+    lastClick.time = time;
+    lastClick.x = x;
+    lastClick.y = y;
+
+    /**
+     * Unfortunately Android sometimes fires click events without touch events (seen on Kindle Fire),
+     * so we have to add more logic to determine the time of the last click.  Not perfect...
+     *
+     * Older, simpler check: if((!e.simulated) || standAlone)
+     */
+    if((!e.simulated && (timeDiff < 500 || (timeDiff < 1500 && xyDiff[0] < 50 && xyDiff[1] < 50))) || standAlone) {
+      e.preventDefault();
+      e.stopPropagation();
+      if(!standAlone) return false;
+    }
+
+    /** 
+     * Special logic for standalone web apps
+     * See http://stackoverflow.com/questions/2898740/iphone-safari-web-app-opens-links-in-new-window
+     */
+    if(standAlone) {
+      window.location = target.getAttribute("href");
+    }
+
+    /**
+     * Add an energize-focus class to the targeted link (mimics :focus behavior)
+     * TODO: test and/or remove?  Does this work?
+     */
+    if(!target || !target.classList) return;
+    target.classList.add("energize-focus");
+    window.setTimeout(function(){
+      target.classList.remove("energize-focus");
+    }, 150);
+  };
+
+  /**
+   * closest
+   * @param {HTMLElement} node current node to start searching from.
+   * @param {string} tagName the (uppercase) name of the tag you're looking for.
+   *
+   * Find the closest ancestor tag of a given node.
+   *
+   * Starts at node and goes up the DOM tree looking for a
+   * matching nodeName, continuing until hitting document.body
+   */
+  closest = function(node, tagName){
+    var curNode = node;
+
+    while(curNode !== document.body) {  // go up the dom until we find the tag we're after
+      if(!curNode || curNode.nodeName === tagName) { return curNode; } // found
+      curNode = curNode.parentNode;     // not found, so keep going up
+    }
+    
+    return null;  // not found
+  };
+
+  /**
+   * Add all delegated event listeners
+   * 
+   * All the events we care about bubble up to document,
+   * so we can take advantage of event delegation.
+   *
+   * Note: no need to wait for DOMContentLoaded here
+   */
+  document.addEventListener('touchstart', touchstart, false);
+  document.addEventListener('touchmove', touchmove, false);
+  document.addEventListener('touchend', touchend, false);
+  document.addEventListener('click', click, true);  // TODO: why does this use capture?
+  
+})();
\ No newline at end of file
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index c206e1bd9e3..399b0d36f4c 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -19,6 +19,7 @@ under the License.
   <head>
     <meta charset="utf-8">
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <title><%= current_page.data.title || "API Documentation" %></title>
 
     <%= stylesheet_link_tag :screen, media: :screen %>
@@ -40,6 +41,10 @@ under the License.
   </head>
 
   <body class="<%= page_classes %>">
+    <a href="#" id="nav-button">
+      <%= image_tag('navbar.png') %>
+      <span>NAV</span>
+    </a>
     <div class="tocify-wrapper">
       <%= image_tag "logo.png" %>
       <% if current_page.data.search %>
diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss
index 363cf824c44..5e594d53395 100644
--- a/source/stylesheets/screen.css.scss
+++ b/source/stylesheets/screen.css.scss
@@ -34,6 +34,7 @@ html, body {
   @extend %default-font;
   background-color: $main-bg;
   height: 100%;
+  -webkit-text-size-adjust: none; /* Never autoresize text */
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -41,9 +42,11 @@ html, body {
 ////////////////////////////////////////////////////////////////////////////////
 
 .tocify-wrapper {
+  @include transition(width ease-in-out 0.3s);
   overflow-y: auto;
   overflow-x: hidden;
   position: fixed;
+  z-index: 30;
   top: 0;
   left: 0;
   bottom: 0;
@@ -70,6 +73,7 @@ html, body {
       width: $nav-width - 30;
       outline: none;
       color: $nav-text;
+      border-radius: 0; /* ios has a default border radius */
     }
 
     &:before {
@@ -182,6 +186,35 @@ html, body {
 
 }
 
+// button to show navigation on mobile devices
+#nav-button {
+  display: none;
+  position: fixed;
+  top: $main-padding / 2 - 8px;
+  left: $main-padding / 2 - 8px;
+  z-index: 100;
+  color: #000;
+  text-decoration: none;
+  font-weight: bold;
+  opacity: 0.7;
+  line-height: 16px;
+  img {
+    height: 16px;
+  }
+  span {
+    position: absolute;
+    top: 30px;
+    left: -0.4em;
+    line-height: 1;
+    @include transform(rotate(-90deg));
+  }
+
+  @include transition(left ease-in-out 0.3s);
+
+  &:hover { opacity: 1; }
+  &.open {left: $main-padding / 2 - 8px + $nav-width}
+}
+
 
 ////////////////////////////////////////////////////////////////////////////////
 // PAGE LAYOUT AND CODE SAMPLE BACKGROUND
@@ -189,7 +222,6 @@ html, body {
 
 .page-wrapper {
   margin-left: $nav-width;
-  min-width: 700px;
   position: relative;
   z-index: 10;
   background-color: $main-bg;
@@ -488,3 +520,26 @@ html, body {
     }
   }
 }
+
+////////////////////////////////////////////////////////////////////////////////
+// RESPONSIVE DESIGN
+////////////////////////////////////////////////////////////////////////////////
+// These are the styles for phones and tablets
+
+@media (max-width: $tablet-width) {
+  .tocify-wrapper {
+    width: 0;
+
+    &.open {
+      width: $nav-width;
+    }
+  }
+
+  .page-wrapper {
+    margin-left: 0;
+  }
+
+  #nav-button {
+    display: block;
+  }
+}
diff --git a/source/stylesheets/variables.scss b/source/stylesheets/variables.scss
index 6e29c1ca0f3..588239a4547 100644
--- a/source/stylesheets/variables.scss
+++ b/source/stylesheets/variables.scss
@@ -60,6 +60,8 @@ $nav-padding: 15px; // padding to left and right of navbar
 $nav-indent: 10px; // extra padding for ToC subitems
 $code-annotation-padding: 13px; // padding inside code annotations
 $h1-margin-bottom: 21px; // padding under the largest header tags
+$tablet-width: 930px; // min width before reverting to tablet size
+$phone-width: $tablet-width - $nav-width; // min width before reverting to mobile size
 
 
 // FONTS

From e559ad1097c0f63e342fe7f231a67d14f5024e19 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Thu, 12 Jun 2014 00:32:50 -0700
Subject: [PATCH 06/36] Add first draft of single column design for phones

---
 source/stylesheets/screen.css.scss | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss
index 5e594d53395..fe904f26a15 100644
--- a/source/stylesheets/screen.css.scss
+++ b/source/stylesheets/screen.css.scss
@@ -301,6 +301,8 @@ html, body {
       @include box-sizing(border-box);
       display: block;
       @include text-shadow($main-embossed-text-shadow);
+
+      @extend %left-col;
     }
 
     &>ul, &>ol {
@@ -496,6 +498,8 @@ html, body {
     @include box-sizing(border-box);
     @include text-shadow(0px 1px 2px rgba(0,0,0,0.4));
 
+    @extend %right-col;
+
     &>p { margin: 0; }
 
     a {
@@ -525,6 +529,7 @@ html, body {
 // RESPONSIVE DESIGN
 ////////////////////////////////////////////////////////////////////////////////
 // These are the styles for phones and tablets
+// There are also a couple styles disperesed
 
 @media (max-width: $tablet-width) {
   .tocify-wrapper {
@@ -543,3 +548,24 @@ html, body {
     display: block;
   }
 }
+
+@media (max-width: $phone-width) {
+  .dark-box {
+    display: none;
+  }
+
+  %left-col {
+    margin-right: 0;
+  }
+
+  %right-col {
+    width: auto;
+    float: none;
+
+    margin-bottom: $main-padding;
+
+    &+blockquote, &+pre {
+      margin-top: -$main-padding;
+    }
+  }
+}

From d77f1e7b9f44b33f65bb88d67fa7e48d3585958c Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Thu, 12 Jun 2014 00:51:50 -0700
Subject: [PATCH 07/36] Increase size of nav button touch target area

---
 source/stylesheets/screen.css.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss
index fe904f26a15..3d2f8d6d2a8 100644
--- a/source/stylesheets/screen.css.scss
+++ b/source/stylesheets/screen.css.scss
@@ -192,6 +192,7 @@ html, body {
   position: fixed;
   top: $main-padding / 2 - 8px;
   left: $main-padding / 2 - 8px;
+  padding: 0 1.5em 5em 0; // increase touch area size
   z-index: 100;
   color: #000;
   text-decoration: none;

From 1478579c59777b9076df1c0ade88296fb2c793c8 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Thu, 12 Jun 2014 01:32:25 -0700
Subject: [PATCH 08/36] Add language tabs to navbar on phone

---
 source/javascripts/app/lang.js     |  6 +--
 source/layouts/layout.erb          | 13 +++++-
 source/stylesheets/screen.css.scss | 67 ++++++++++++++++++------------
 3 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/source/javascripts/app/lang.js b/source/javascripts/app/lang.js
index 3b02e093f4f..ae18b9cf3a2 100644
--- a/source/javascripts/app/lang.js
+++ b/source/javascripts/app/lang.js
@@ -22,8 +22,8 @@ under the License.
   function activateLanguage(language) {
     if (!language) return;
 
-    $("#lang-selector a").removeClass('active');
-    $("#lang-selector a[data-language-name='" + language + "']").addClass('active');
+    $(".lang-selector a").removeClass('active');
+    $(".lang-selector a[data-language-name='" + language + "']").addClass('active');
     for (var i=0; i < languages.length; i++) {
       $(".highlight." + languages[i]).hide();
     }
@@ -66,7 +66,7 @@ under the License.
 
   // if we click on a language tab, activate that language
   $(function() {
-    $("#lang-selector a").on("click", function() {
+    $(".lang-selector a").on("click", function() {
       var language = $(this).data("language-name");
       pushURL(language);
       activateLanguage(language);
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index 399b0d36f4c..c5d41ae216f 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -47,6 +47,17 @@ under the License.
     </a>
     <div class="tocify-wrapper">
       <%= image_tag "logo.png" %>
+      <% if language_tabs %>
+        <div class="lang-selector">
+          <% language_tabs.each do |lang| %>
+            <% if lang.is_a? Hash %>
+              <a href="#" data-language-name="<%= lang.keys.first %>"><%= lang.values.first %></a>
+            <% else %>
+              <a href="#" data-language-name="<%= lang %>"><%= lang %></a>
+            <% end %>
+          <% end %>
+        </div>
+      <% end %>
       <% if current_page.data.search %>
         <div class="search">
           <input type="text" class="search" id="input-search">
@@ -73,7 +84,7 @@ under the License.
       </div>
       <div class="dark-box">
         <% if language_tabs %>
-          <div id="lang-selector">
+          <div class="lang-selector">
             <% language_tabs.each do |lang| %>
               <% if lang.is_a? Hash %>
                 <a href="#" data-language-name="<%= lang.keys.first %>"><%= lang.values.first %></a>
diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss
index 3d2f8d6d2a8..aa46e82d4aa 100644
--- a/source/stylesheets/screen.css.scss
+++ b/source/stylesheets/screen.css.scss
@@ -42,7 +42,7 @@ html, body {
 ////////////////////////////////////////////////////////////////////////////////
 
 .tocify-wrapper {
-  @include transition(width ease-in-out 0.3s);
+  @include transition(left ease-in-out 0.3s);
   overflow-y: auto;
   overflow-x: hidden;
   position: fixed;
@@ -55,6 +55,10 @@ html, body {
   font-size: 13px;
   font-weight: bold;
 
+  .lang-selector {
+    display: none; // only on mobile
+  }
+
   // This is the logo at the top of the ToC
   &>img {
     display: block;
@@ -244,38 +248,41 @@ html, body {
     bottom: 0;
   }
 
-  #lang-selector {
+  .lang-selector {
     position: fixed;
-    width: 100%;
     z-index: 50;
-    font-weight: bold;
-    background-color: $lang-select-bg;
     border-bottom: 5px solid $lang-select-active-bg;
-    a {
-      display: block;
-      float:left;
-      color: $lang-select-text;
-      text-decoration: none;
-      padding: 0 10px;
-      line-height: 30px;
+  }
+}
 
-      &:active {
-        background-color: $lang-select-pressed-bg;
-        color: $lang-select-pressed-text;
-      }
+.lang-selector {
+  background-color: $lang-select-bg;
+  width: 100%;
+  font-weight: bold;
+  a {
+    display: block;
+    float:left;
+    color: $lang-select-text;
+    text-decoration: none;
+    padding: 0 10px;
+    line-height: 30px;
 
-      &.active {
-        background-color: $lang-select-active-bg;
-        color: $lang-select-active-text;
-      }
+    &:active {
+      background-color: $lang-select-pressed-bg;
+      color: $lang-select-pressed-text;
     }
 
-    &:after {
-      content: '';
-      clear: both;
-      display: block;
+    &.active {
+      background-color: $lang-select-active-bg;
+      color: $lang-select-active-text;
     }
   }
+
+  &:after {
+    content: '';
+    clear: both;
+    display: block;
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -534,10 +541,10 @@ html, body {
 
 @media (max-width: $tablet-width) {
   .tocify-wrapper {
-    width: 0;
+    left: -$nav-width;
 
     &.open {
-      width: $nav-width;
+      left: 0;
     }
   }
 
@@ -559,6 +566,14 @@ html, body {
     margin-right: 0;
   }
 
+  .tocify-wrapper .lang-selector {
+    display: block;
+  }
+
+  .page-wrapper .lang-selector {
+    display: none;
+  }
+
   %right-col {
     width: auto;
     float: none;

From 1e144aaa661adb0dd11a93139ff92194434ffa78 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Thu, 12 Jun 2014 01:39:37 -0700
Subject: [PATCH 09/36] Update nav button to go to very edge of screen

---
 source/stylesheets/screen.css.scss | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss
index aa46e82d4aa..3f7459b3507 100644
--- a/source/stylesheets/screen.css.scss
+++ b/source/stylesheets/screen.css.scss
@@ -194,9 +194,10 @@ html, body {
 #nav-button {
   display: none;
   position: fixed;
-  top: $main-padding / 2 - 8px;
-  left: $main-padding / 2 - 8px;
-  padding: 0 1.5em 5em 0; // increase touch area size
+  top: 0;
+  left: 0;
+  $side-pad: $main-padding / 2 - 8px;
+  padding: $side-pad 1.5em 5em $side-pad; // increase touch area size
   z-index: 100;
   color: #000;
   text-decoration: none;
@@ -208,8 +209,8 @@ html, body {
   }
   span {
     position: absolute;
-    top: 30px;
-    left: -0.4em;
+    top: 35px;
+    left: 1px;
     line-height: 1;
     @include transform(rotate(-90deg));
   }
@@ -217,7 +218,7 @@ html, body {
   @include transition(left ease-in-out 0.3s);
 
   &:hover { opacity: 1; }
-  &.open {left: $main-padding / 2 - 8px + $nav-width}
+  &.open {left: $nav-width}
 }
 
 

From 3125ad8f72cb73841880d3489f92a9eac77b6739 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Thu, 12 Jun 2014 01:48:53 -0700
Subject: [PATCH 10/36] Add extra margin to nav touch targets on mobile

---
 source/stylesheets/screen.css.scss | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss
index 3f7459b3507..5f87ed2456d 100644
--- a/source/stylesheets/screen.css.scss
+++ b/source/stylesheets/screen.css.scss
@@ -55,8 +55,13 @@ html, body {
   font-size: 13px;
   font-weight: bold;
 
+  // language selector for mobile devices
   .lang-selector {
-    display: none; // only on mobile
+    display: none;
+    a {
+      padding-top: 0.5em;
+      padding-bottom: 0.5em;
+    }
   }
 
   // This is the logo at the top of the ToC
@@ -556,6 +561,11 @@ html, body {
   #nav-button {
     display: block;
   }
+
+  .tocify-wrapper .tocify-item > a {
+    padding-top: 0.3em;
+    padding-bottom: 0.3em;
+  }
 }
 
 @media (max-width: $phone-width) {

From 65496915b86ac34f14a82d9da7bc3f954abb6d54 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Thu, 12 Jun 2014 16:02:41 -0700
Subject: [PATCH 11/36] Hide mobile lang selector and search on print

---
 source/stylesheets/print.css.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/stylesheets/print.css.scss b/source/stylesheets/print.css.scss
index 7130f985ee4..4bda057f019 100644
--- a/source/stylesheets/print.css.scss
+++ b/source/stylesheets/print.css.scss
@@ -28,7 +28,7 @@ body {
   @extend %default-font;
 }
 
-.tocify, .toc-footer {
+.tocify, .toc-footer, .lang-selector, .search, #nav-button {
   display: none;
 }
 

From 00a93ec76e4fb5dca24579a474765ed55a1617d1 Mon Sep 17 00:00:00 2001
From: Robert Lord <hello@lord.io>
Date: Thu, 12 Jun 2014 16:04:52 -0700
Subject: [PATCH 12/36] Add new screenshot to README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 57624945941..6e395e52475 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Slate
 
 Slate helps you create beautiful single-page API documentation. Think of it as an intelligent, modern documentation template for your API.
 
-<img src="https://dl.dropboxusercontent.com/u/95847291/github%20images/slate/slate_screenshot.png" width=700 alt="Screenshot of Example Documentation created with Slate">
+<img src="https://dl.dropboxusercontent.com/u/95847291/github%20images/slate/slate_screenshot_new.png" width=700 alt="Screenshot of Example Documentation created with Slate">
 
 *The example above was created with Slate. Check it out at [tripit.github.io/slate](http://tripit.github.io/slate).*
 

From 062e35a3b3fc0ef27c8d185a5f6caf8819945441 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Sat, 14 Jun 2014 18:55:32 -0700
Subject: [PATCH 13/36] Update readme with responsive notes

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 6e395e52475..2dc84dd367b 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Slate
 
 [![Build Status](https://travis-ci.org/tripit/slate.svg?branch=master)](https://travis-ci.org/tripit/slate) [![Dependency Status](https://gemnasium.com/tripit/slate.png)](https://gemnasium.com/tripit/slate)
 
-Slate helps you create beautiful single-page API documentation. Think of it as an intelligent, modern documentation template for your API.
+Slate helps you create beautiful API documentation. Think of it as an intelligent, responsive documentation template for your API.
 
 <img src="https://dl.dropboxusercontent.com/u/95847291/github%20images/slate/slate_screenshot_new.png" width=700 alt="Screenshot of Example Documentation created with Slate">
 
@@ -12,9 +12,9 @@ Slate helps you create beautiful single-page API documentation. Think of it as a
 Features
 ------------
 
-* **Clean, intuitive design** — with Slate, the description of your API is on the left side of your documentation, and all the code examples are on the right side. Inspired by [Stripe's](https://stripe.com/docs/api) and [Paypal's](https://developer.paypal.com/webapps/developer/docs/api/) API docs. In addition to the design you see on screen, Slate comes with a print stylesheet, so your docs look great on paper.
+* **Clean, intuitive design** — with Slate, the description of your API is on the left side of your documentation, and all the code examples are on the right side. Inspired by [Stripe's](https://stripe.com/docs/api) and [Paypal's](https://developer.paypal.com/webapps/developer/docs/api/) API docs. Slate is responsive, so it looks great on tablets, phones, and even print.
 
-* **Everything on a single page** — gone are the days where your users had to search through a million pages to find what they wanted. Slate puts the entire documentation on a single page. We haven't sacrificed linkability, though. As you scroll, your browser's hash will update to the nearest header, so it's insanely easy to link to a particular point in the documentation.
+* **Everything on a single page** — gone are the days where your users had to search through a million pages to find what they wanted. Slate puts the entire documentation on a single page. We haven't sacrificed linkability, though. As you scroll, your browser's hash will update to the nearest header, so linking to a particular point in the documentation is still natural and easy.
 
 * **Slate is just Markdown** — when you write docs with Slate, you're just writing Markdown, which makes it simple to edit and understand. Everything is written in Markdown — even the code samples are just Markdown code blocks!
 

From 3a91faa8e6d743117595638ea90c9a10a44ecc12 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Sat, 14 Jun 2014 19:19:43 -0700
Subject: [PATCH 14/36] Fix bug with messed up margin on some code samples on
 phones

---
 source/stylesheets/screen.css.scss | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss
index 5f87ed2456d..32d2834d61c 100644
--- a/source/stylesheets/screen.css.scss
+++ b/source/stylesheets/screen.css.scss
@@ -588,11 +588,9 @@ html, body {
   %right-col {
     width: auto;
     float: none;
+  }
 
-    margin-bottom: $main-padding;
-
-    &+blockquote, &+pre {
-      margin-top: -$main-padding;
-    }
+  %right-col + %left-col {
+    margin-top: $main-padding;
   }
 }

From b5419b1e9c077f71a15fed3f519739a018028a6c Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Sat, 14 Jun 2014 19:41:08 -0700
Subject: [PATCH 15/36] Add background to nav button

---
 source/layouts/layout.erb          |  6 ++++--
 source/stylesheets/screen.css.scss | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index c5d41ae216f..1e8f3950cc8 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -42,8 +42,10 @@ under the License.
 
   <body class="<%= page_classes %>">
     <a href="#" id="nav-button">
-      <%= image_tag('navbar.png') %>
-      <span>NAV</span>
+      <span>
+        NAV
+        <%= image_tag('navbar.png') %>
+      </span>
     </a>
     <div class="tocify-wrapper">
       <%= image_tag "logo.png" %>
diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss
index 32d2834d61c..23873d70224 100644
--- a/source/stylesheets/screen.css.scss
+++ b/source/stylesheets/screen.css.scss
@@ -197,12 +197,20 @@ html, body {
 
 // button to show navigation on mobile devices
 #nav-button {
+  span {
+    display: block;
+    $side-pad: $main-padding / 2 - 8px;
+    padding: $side-pad $side-pad $side-pad;
+    background-color: rgba($main-bg, 0.7);
+    @include transform-origin(0, 0);
+    @include transform(rotate(-90deg) translate(-100%, 0));
+    border-radius: 0 0 0 5px;
+  }
+  padding: 0 1.5em 5em 0; // increase touch size area
   display: none;
   position: fixed;
   top: 0;
   left: 0;
-  $side-pad: $main-padding / 2 - 8px;
-  padding: $side-pad 1.5em 5em $side-pad; // increase touch area size
   z-index: 100;
   color: #000;
   text-decoration: none;
@@ -211,13 +219,7 @@ html, body {
   line-height: 16px;
   img {
     height: 16px;
-  }
-  span {
-    position: absolute;
-    top: 35px;
-    left: 1px;
-    line-height: 1;
-    @include transform(rotate(-90deg));
+    vertical-align: bottom;
   }
 
   @include transition(left ease-in-out 0.3s);

From f4f2a1abfaa16174a1fad3df76d4b6d20f0d1f0b Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Sat, 14 Jun 2014 19:43:37 -0700
Subject: [PATCH 16/36] Re-rotate nav button image

---
 source/images/navbar.png | Bin 150 -> 2790 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/source/images/navbar.png b/source/images/navbar.png
index cf80e9bcf5cf4038c05b64500f3150cef2434d4b..32e70e14fb45cbf6a64b00115c78c4b8dfee4981 100644
GIT binary patch
delta 2783
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

delta 122
zcmV-=0EPeN6_x>zBXa;<Nkl<ZSP5fb7zHCe1Q^i+z|zw4Ke`w-`NxkRN3oNMnue2O
z)~Ex>3AIr@qaiT7LI9;y0(ot;B&2r)4|q{bZx4^!HyQ$iF9b$Q!T~Rc2HXLIFIA4Z
ch~6Op02}NK7IFa_^8f$<07*qoM6N<$f&_sp&;S4c


From 3e4f52dfc9e307eaf1ffcff8feb49dcb1857d9ef Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Sun, 15 Jun 2014 22:34:25 -0700
Subject: [PATCH 17/36] Add note to readme about sauce labs

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 2dc84dd367b..a5825ed5c82 100644
--- a/README.md
+++ b/README.md
@@ -77,6 +77,8 @@ Special Thanks
 - [middleman-gh-pages](https://github.com/neo/middleman-gh-pages)
 - [Font Awesome](http://fortawesome.github.io/Font-Awesome/)
 
+Also, thanks to [Sauce Labs](http://saucelabs.com) for helping sponsor the project.
+
 Contributors
 --------------------
 

From c1359e81a7862ccee5c941e822bedc259f82ee9a Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Mon, 16 Jun 2014 12:09:08 -0700
Subject: [PATCH 18/36] Add note to readme about Travis-ci and Mozilla

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index a5825ed5c82..420715dcb68 100644
--- a/README.md
+++ b/README.md
@@ -55,6 +55,8 @@ Now that Slate is all set up your machine, you'll probably want to learn more ab
 Examples of Slate in the Wild
 ---------------------------------
 
+* [Travis-CI's API docs](http://docs.travis-ci.com/api/)
+* [Mozilla's localForage docs](http://mozilla.github.io/localForage/)
 * [Orchestrate.io API docs](https://docs.orchestrate.io/)
 * [ChaiOne Gameplan API docs](http://chaione.github.io/gameplanb2b/#introduction)
 * [Drcaban's Build a Quine tutorial](http://drcabana.github.io/build-a-quine/#introduction)

From 200a871f85cfa00a34738fea32f7193d92c3acba Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Sun, 22 Jun 2014 02:02:14 -0700
Subject: [PATCH 19/36] Update gems

---
 Gemfile.lock | 63 ++++++++++++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f4394730937..754cebf7274 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,13 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.0.4)
+    activesupport (4.1.1)
       i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    chunky_png (1.3.0)
+      tzinfo (~> 1.1)
+    chunky_png (1.3.1)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
@@ -18,12 +18,12 @@ GEM
       sass (~> 3.2.19)
     compass-import-once (1.0.4)
       sass (>= 3.2, < 3.5)
-    em-websocket (0.5.0)
+    em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.5.3)
+      http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
     eventmachine (1.0.3)
-    execjs (2.0.2)
+    execjs (2.2.0)
     ffi (1.9.3)
     fssm (0.2.10)
     haml (4.0.5)
@@ -31,28 +31,28 @@ GEM
     hike (1.2.3)
     hooks (0.4.0)
       uber (~> 0.0.4)
-    http_parser.rb (0.5.3)
+    http_parser.rb (0.6.0)
     i18n (0.6.9)
     json (1.8.1)
-    kramdown (1.3.3)
+    kramdown (1.4.0)
     libv8 (3.16.14.3)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    middleman (3.3.2)
+    middleman (3.3.3)
       coffee-script (~> 2.2.0)
       compass (>= 0.12.4)
-      compass-import-once (~> 1.0.4)
+      compass-import-once (= 1.0.4)
       execjs (~> 2.0)
       haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-core (= 3.3.2)
+      middleman-core (= 3.3.3)
       middleman-sprockets (>= 3.1.2)
       sass (>= 3.2.17, < 4.0)
       uglifier (~> 2.5)
-    middleman-core (3.3.2)
-      activesupport (~> 4.0.1)
+    middleman-core (3.3.3)
+      activesupport (~> 4.1.0)
       bundler (~> 1.1)
       erubis
       hooks (~> 0.3)
@@ -65,8 +65,8 @@ GEM
       tilt (~> 1.4.1, < 2.0)
     middleman-gh-pages (0.0.3)
       rake (> 0.9.3)
-    middleman-livereload (3.3.2)
-      em-websocket (~> 0.5.0)
+    middleman-livereload (3.3.4)
+      em-websocket (~> 0.5.1)
       middleman-core (~> 3.2)
       rack-livereload (~> 0.3.15)
     middleman-sprockets (3.3.3)
@@ -77,28 +77,28 @@ GEM
     middleman-syntax (2.0.0)
       middleman-core (~> 3.2)
       rouge (~> 1.0)
-    minitest (4.7.5)
-    multi_json (1.9.2)
-    padrino-helpers (0.12.1)
+    minitest (5.3.5)
+    multi_json (1.10.1)
+    padrino-helpers (0.12.2)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.1)
+      padrino-support (= 0.12.2)
       tilt (~> 1.4.1)
-    padrino-support (0.12.1)
+    padrino-support (0.12.2)
       activesupport (>= 3.1)
     rack (1.5.2)
     rack-livereload (0.3.15)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.3.1)
+    rake (10.3.2)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.2)
+    rb-kqueue (0.2.3)
       ffi (>= 0.5.0)
-    redcarpet (3.1.1)
+    redcarpet (3.1.2)
     ref (1.0.5)
-    rouge (1.3.3)
+    rouge (1.4.0)
     ruby18_source_location (0.2)
     sass (3.2.19)
     sprockets (2.12.1)
@@ -115,11 +115,12 @@ GEM
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tilt (1.4.1)
-    tzinfo (0.3.39)
-    uber (0.0.4)
-    uglifier (2.5.0)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
+    uber (0.0.6)
+    uglifier (2.5.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 

From b147e6a2d7685e88d3c9eb64051d50fbd9075c84 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Sun, 22 Jun 2014 02:33:55 -0700
Subject: [PATCH 20/36] Update toc javascript to hopefully be more performant

---
 source/javascripts/lib/jquery.tocify.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/javascripts/lib/jquery.tocify.js b/source/javascripts/lib/jquery.tocify.js
index d32ad7b066b..f791bf86246 100644
--- a/source/javascripts/lib/jquery.tocify.js
+++ b/source/javascripts/lib/jquery.tocify.js
@@ -681,9 +681,11 @@
                             self.calculateHeights();
                         }
 
+                        var scrollTop = $(window).scrollTop();
+
                         // Determines the index of the closest anchor
                         self.cachedAnchors.each(function(idx) {
-                            if (self.cachedHeights[idx] - $(window).scrollTop() < 0) {
+                            if (self.cachedHeights[idx] - scrollTop < 0) {
                                 closestAnchorIdx = idx;
                             } else {
                                 return false;
@@ -696,7 +698,7 @@
                         elem = $('li[data-unique="' + anchorText + '"]');
 
                         // If the `highlightOnScroll` option is true and a next element is found
-                        if(self.options.highlightOnScroll && elem.length) {
+                        if(self.options.highlightOnScroll && elem.length && !elem.hasClass(self.focusClass)) {
 
                             // Removes highlighting from all of the list item's
                             self.element.find("." + self.focusClass).removeClass(self.focusClass);

From bdbd7a38a86ef2d0593445a54fdca93c8bd7a9ce Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Sun, 22 Jun 2014 02:37:01 -0700
Subject: [PATCH 21/36] Update app javascript to pass jslint, fixes #80

---
 source/javascripts/app/search.js |  4 ++--
 source/javascripts/app/toc.js    | 16 ++++++----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/source/javascripts/app/search.js b/source/javascripts/app/search.js
index 15213047e9d..374094a7897 100644
--- a/source/javascripts/app/search.js
+++ b/source/javascripts/app/search.js
@@ -4,7 +4,7 @@
   var content, darkBox, searchInfo;
   var highlightOpts = { element: 'span', className: 'search-highlight' };
 
-  var index = new lunr.Index;
+  var index = new lunr.Index();
 
   index.ref('id');
   index.field('title', { boost: 10 });
@@ -92,7 +92,7 @@
         // position first element. it wasn't positioned above if len > 1
         if (results.length > 1) {
           var firstRef = results[0].ref;
-          var secondRef = results[1].ref
+          var secondRef = results[1].ref;
           refToHeader(firstRef).insertBefore(refToHeader(secondRef));
         }
 
diff --git a/source/javascripts/app/toc.js b/source/javascripts/app/toc.js
index 60caf7894d4..8946f87a83e 100644
--- a/source/javascripts/app/toc.js
+++ b/source/javascripts/app/toc.js
@@ -1,19 +1,12 @@
 (function (global) {
 
-  var toc;
-
-  global.toc = toc;
-
-  $(toc);
-  $(animate);
-
   var closeToc = function() {
     $(".tocify-wrapper").removeClass('open');
     $("#nav-button").removeClass('open');
   };
 
-  function toc () {
-    toc = $("#toc").tocify({
+  var makeToc = function() {
+    global.toc = $("#toc").tocify({
       selectors: 'h1, h2',
       extendPage: false,
       theme: 'none',
@@ -37,7 +30,7 @@
 
     $(".page-wrapper").click(closeToc);
     $(".tocify-item").click(closeToc);
-  }
+  };
 
   // Hack to make already open sections to start opened,
   // instead of displaying an ugly animation
@@ -47,5 +40,8 @@
     }, 50);
   }
 
+  $(makeToc);
+  $(animate);
+
 })(window);
 

From 0f93ffcc2be1202d86906a9904c790df64e04d8a Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Sun, 22 Jun 2014 02:41:16 -0700
Subject: [PATCH 22/36] More js cleanup for #80

---
 source/javascripts/app/search.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/source/javascripts/app/search.js b/source/javascripts/app/search.js
index 374094a7897..16cbce0339e 100644
--- a/source/javascripts/app/search.js
+++ b/source/javascripts/app/search.js
@@ -14,8 +14,8 @@
   $(populate);
   $(bind);
 
-  function populate () {
-    $('h1').each(function () {
+  function populate() {
+    $('h1').each(function() {
       var title = $(this);
       var body = title.nextUntil('h1');
       var wrapper = $('<section id="section-' + title.prop('id') + '"></section>');
@@ -31,7 +31,7 @@
     });
   }
 
-  function bind () {
+  function bind() {
     content = $('.content');
     darkBox = $('.dark-box');
     searchInfo = $('.search-info');
@@ -42,24 +42,24 @@
       .on('blur', inactive);
   }
 
-  function refToHeader (itemRef) {
+  function refToHeader(itemRef) {
     return $('.tocify-item[data-unique=' + itemRef + ']').closest('.tocify-header');
   }
 
-  function sortDescending (obj2, obj1) {
+  function sortDescending(obj2, obj1) {
     var s1 = parseInt(obj1.id.replace(/[^\d]/g, ''), 10);
     var s2 = parseInt(obj2.id.replace(/[^\d]/g, ''), 10);
     return s1 === s2 ? 0 : s1 < s2 ? -1 : 1;
   }
 
-  function resetHeaderLocations () {
+  function resetHeaderLocations() {
     var headers = $(".tocify-header").sort(sortDescending);
     $.each(headers, function (index, item) {
       $(item).insertBefore($("#toc ul:first-child"));
     });
   }
 
-  function search (event) {
+  function search(event) {
     var sections = $('section, #toc .tocify-header');
 
     searchInfo.hide();
@@ -110,20 +110,20 @@
     $global.triggerHandler('resize');
   }
 
-  function active () {
+  function active() {
     search.call(this, {});
   }
 
-  function inactive () {
+  function inactive() {
     unhighlight();
     searchInfo.hide();
   }
 
-  function highlight () {
+  function highlight() {
     if (this.value) content.highlight(this.value, highlightOpts);
   }
 
-  function unhighlight () {
+  function unhighlight() {
     content.unhighlight(highlightOpts);
   }
 

From d1fdd685a65e4d971f8d532926543a24c56207a0 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Sun, 22 Jun 2014 03:10:26 -0700
Subject: [PATCH 23/36] Fix default language selection bug

---
 source/javascripts/app/lang.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/javascripts/app/lang.js b/source/javascripts/app/lang.js
index ae18b9cf3a2..002990186f4 100644
--- a/source/javascripts/app/lang.js
+++ b/source/javascripts/app/lang.js
@@ -41,6 +41,9 @@ under the License.
       hash = hash.replace(/^#+/, '');
     }
     history.pushState({}, '', '?' + language + '#' + hash);
+
+    // save language as next default
+    localStorage.setItem("language", language);
   }
 
   function setupLanguages(l) {
@@ -53,7 +56,6 @@ under the License.
       // the language is in the URL, so use that language!
       activateLanguage(location.search.substr(1));
 
-      // set this language as the default for next time, if the URL has no language
       localStorage.setItem("language", location.search.substr(1));
     } else if ((defaultLanguage !== null) && (jQuery.inArray(defaultLanguage, languages) != -1)) {
       // the language was the last selected one saved in localstorage, so use that language!

From f868ff0bcfe54d02f18ad54b5c202d9fc63f59b1 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Sun, 22 Jun 2014 03:14:38 -0700
Subject: [PATCH 24/36] Revert to old versions of gems, until codeblock-messing
 up reason is identified

---
 Gemfile.lock | 63 ++++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 754cebf7274..f4394730937 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,13 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.1.1)
+    activesupport (4.0.4)
       i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
       thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    chunky_png (1.3.1)
+      tzinfo (~> 0.3.37)
+    chunky_png (1.3.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
@@ -18,12 +18,12 @@ GEM
       sass (~> 3.2.19)
     compass-import-once (1.0.4)
       sass (>= 3.2, < 3.5)
-    em-websocket (0.5.1)
+    em-websocket (0.5.0)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
+      http_parser.rb (~> 0.5.3)
     erubis (2.7.0)
     eventmachine (1.0.3)
-    execjs (2.2.0)
+    execjs (2.0.2)
     ffi (1.9.3)
     fssm (0.2.10)
     haml (4.0.5)
@@ -31,28 +31,28 @@ GEM
     hike (1.2.3)
     hooks (0.4.0)
       uber (~> 0.0.4)
-    http_parser.rb (0.6.0)
+    http_parser.rb (0.5.3)
     i18n (0.6.9)
     json (1.8.1)
-    kramdown (1.4.0)
+    kramdown (1.3.3)
     libv8 (3.16.14.3)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    middleman (3.3.3)
+    middleman (3.3.2)
       coffee-script (~> 2.2.0)
       compass (>= 0.12.4)
-      compass-import-once (= 1.0.4)
+      compass-import-once (~> 1.0.4)
       execjs (~> 2.0)
       haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-core (= 3.3.3)
+      middleman-core (= 3.3.2)
       middleman-sprockets (>= 3.1.2)
       sass (>= 3.2.17, < 4.0)
       uglifier (~> 2.5)
-    middleman-core (3.3.3)
-      activesupport (~> 4.1.0)
+    middleman-core (3.3.2)
+      activesupport (~> 4.0.1)
       bundler (~> 1.1)
       erubis
       hooks (~> 0.3)
@@ -65,8 +65,8 @@ GEM
       tilt (~> 1.4.1, < 2.0)
     middleman-gh-pages (0.0.3)
       rake (> 0.9.3)
-    middleman-livereload (3.3.4)
-      em-websocket (~> 0.5.1)
+    middleman-livereload (3.3.2)
+      em-websocket (~> 0.5.0)
       middleman-core (~> 3.2)
       rack-livereload (~> 0.3.15)
     middleman-sprockets (3.3.3)
@@ -77,28 +77,28 @@ GEM
     middleman-syntax (2.0.0)
       middleman-core (~> 3.2)
       rouge (~> 1.0)
-    minitest (5.3.5)
-    multi_json (1.10.1)
-    padrino-helpers (0.12.2)
+    minitest (4.7.5)
+    multi_json (1.9.2)
+    padrino-helpers (0.12.1)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.2)
+      padrino-support (= 0.12.1)
       tilt (~> 1.4.1)
-    padrino-support (0.12.2)
+    padrino-support (0.12.1)
       activesupport (>= 3.1)
     rack (1.5.2)
     rack-livereload (0.3.15)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.3.2)
+    rake (10.3.1)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
+    rb-inotify (0.9.3)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.3)
+    rb-kqueue (0.2.2)
       ffi (>= 0.5.0)
-    redcarpet (3.1.2)
+    redcarpet (3.1.1)
     ref (1.0.5)
-    rouge (1.4.0)
+    rouge (1.3.3)
     ruby18_source_location (0.2)
     sass (3.2.19)
     sprockets (2.12.1)
@@ -115,12 +115,11 @@ GEM
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.3)
     tilt (1.4.1)
-    tzinfo (1.2.1)
-      thread_safe (~> 0.1)
-    uber (0.0.6)
-    uglifier (2.5.1)
+    tzinfo (0.3.39)
+    uber (0.0.4)
+    uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 

From 1bb564f84a0efc19d9a6bd352348eee7540f7f4b Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Mon, 23 Jun 2014 23:14:37 -0700
Subject: [PATCH 25/36] Shuffle readme, add link to myself

---
 README.md | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 420715dcb68..0037b052244 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,18 @@ Need Help? Found a bug?
 Just [submit a issue](https://github.com/tripit/slate/issues) to the Slate Github if you need any help. And, of course, feel free to submit pull requests with bug fixes or changes.
 
 
+Contributors
+--------------------
+
+Slate was built by [Robert Lord](http://lord.io) ([gh](https://github.com/lord), [tw](http://twitter.com/rlordio)) while at [TripIt](http://tripit.com).
+
+Also, thanks to the following people who have submitted major pull requests:
+
+- [@chrissrogers](https://github.com/chrissrogers)
+- [@bootstraponline](https://github.com/bootstraponline)
+
+Also, thanks to [Sauce Labs](http://saucelabs.com) for helping sponsor the project.
+
 Special Thanks
 --------------------
 - [Middleman](https://github.com/middleman/middleman)
@@ -78,13 +90,3 @@ Special Thanks
 - [middleman-syntax](https://github.com/middleman/middleman-syntax)
 - [middleman-gh-pages](https://github.com/neo/middleman-gh-pages)
 - [Font Awesome](http://fortawesome.github.io/Font-Awesome/)
-
-Also, thanks to [Sauce Labs](http://saucelabs.com) for helping sponsor the project.
-
-Contributors
---------------------
-
-Thanks to the following people who have submitted pull requests:
-
-- [@chrissrogers](https://github.com/chrissrogers)
-- [@bootstraponline](https://github.com/bootstraponline)

From d552a1b5cba4e667feb1d6e9616c73b0307f711e Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Mon, 23 Jun 2014 23:15:31 -0700
Subject: [PATCH 26/36] More readme changes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0037b052244..a6d7a7f885c 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ Just [submit a issue](https://github.com/tripit/slate/issues) to the Slate Githu
 Contributors
 --------------------
 
-Slate was built by [Robert Lord](http://lord.io) ([gh](https://github.com/lord), [tw](http://twitter.com/rlordio)) while at [TripIt](http://tripit.com).
+Slate was built by [Robert Lord](http://lord.io) while at [TripIt](http://tripit.com).
 
 Also, thanks to the following people who have submitted major pull requests:
 

From 0f89c96ba0599b23ee62bc049dbf77f08c57ae99 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Mon, 23 Jun 2014 23:16:58 -0700
Subject: [PATCH 27/36] Remove extra 'also' from README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a6d7a7f885c..91eb2397785 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ Contributors
 
 Slate was built by [Robert Lord](http://lord.io) while at [TripIt](http://tripit.com).
 
-Also, thanks to the following people who have submitted major pull requests:
+Thanks to the following people who have submitted major pull requests:
 
 - [@chrissrogers](https://github.com/chrissrogers)
 - [@bootstraponline](https://github.com/bootstraponline)

From e8a491c9ea24ef2fba2a7a61e9698c744fb9e2b6 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Tue, 24 Jun 2014 01:03:32 -0700
Subject: [PATCH 28/36] Fix unrecognized .highlight. bug #84

---
 source/javascripts/app/lang.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/javascripts/app/lang.js b/source/javascripts/app/lang.js
index 002990186f4..fdb899716c8 100644
--- a/source/javascripts/app/lang.js
+++ b/source/javascripts/app/lang.js
@@ -21,6 +21,7 @@ under the License.
 
   function activateLanguage(language) {
     if (!language) return;
+    if (language === "") return;
 
     $(".lang-selector a").removeClass('active');
     $(".lang-selector a[data-language-name='" + language + "']").addClass('active');

From 719061a638cad2922158880eda99762ffa9b46c9 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Tue, 24 Jun 2014 22:34:25 -0700
Subject: [PATCH 29/36] Update headers to never have problematic characters in
 ids, fixes #64, hopefully

---
 config.rb                   | 3 +++
 lib/redcarpet_header_fix.rb | 9 +++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 lib/redcarpet_header_fix.rb

diff --git a/config.rb b/config.rb
index 31e4d2ca373..c69665926c8 100644
--- a/config.rb
+++ b/config.rb
@@ -1,3 +1,5 @@
+require './lib/redcarpet_header_fix'
+
 set :css_dir, 'stylesheets'
 
 set :js_dir, 'javascripts'
@@ -34,3 +36,4 @@
   # Or use a different image path
   # set :http_prefix, "/Content/images/"
 end
+
diff --git a/lib/redcarpet_header_fix.rb b/lib/redcarpet_header_fix.rb
new file mode 100644
index 00000000000..170d4b843d7
--- /dev/null
+++ b/lib/redcarpet_header_fix.rb
@@ -0,0 +1,9 @@
+module RedcarpetHeaderFix
+  def header(text, level, id)
+    clean_id = id.gsub(/[\.]/, '-').gsub(/[^a-zA-Z0-9\-_]/, '')
+    "<h#{level} id='#{clean_id}'>#{text}</h1>"
+  end
+end
+
+require 'middleman-core/renderers/redcarpet'
+Middleman::Renderers::MiddlemanRedcarpetHTML.send :include, RedcarpetHeaderFix

From 324da17ba324fb5b2ca34fd244079e3b5ba42ca4 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Wed, 2 Jul 2014 22:34:58 -0700
Subject: [PATCH 30/36] Fix bugs with toc not highlighting, begin search
 overhaul

---
 source/javascripts/app/search.js   |  82 ++------
 source/javascripts/app/toc.js      |   2 +-
 source/layouts/layout.erb          |   2 +-
 source/stylesheets/screen.css.scss | 299 +++++++++++++++--------------
 4 files changed, 168 insertions(+), 217 deletions(-)

diff --git a/source/javascripts/app/search.js b/source/javascripts/app/search.js
index 16cbce0339e..55c222ff15e 100644
--- a/source/javascripts/app/search.js
+++ b/source/javascripts/app/search.js
@@ -1,7 +1,7 @@
 (function (global) {
 
   var $global = $(global);
-  var content, darkBox, searchInfo;
+  var content, darkBox, searchResults;
   var highlightOpts = { element: 'span', className: 'search-highlight' };
 
   var index = new lunr.Index();
@@ -18,11 +18,6 @@
     $('h1').each(function() {
       var title = $(this);
       var body = title.nextUntil('h1');
-      var wrapper = $('<section id="section-' + title.prop('id') + '"></section>');
-
-      title.after(wrapper.append(body));
-      wrapper.prepend(title);
-
       index.add({
         id: title.prop('id'),
         title: title.text(),
@@ -34,89 +29,42 @@
   function bind() {
     content = $('.content');
     darkBox = $('.dark-box');
-    searchInfo = $('.search-info');
+    searchResults = $('.search-results');
 
-    $('#input-search')
-      .on('keyup', search)
-      .on('focus', active)
-      .on('blur', inactive);
-  }
-
-  function refToHeader(itemRef) {
-    return $('.tocify-item[data-unique=' + itemRef + ']').closest('.tocify-header');
-  }
-
-  function sortDescending(obj2, obj1) {
-    var s1 = parseInt(obj1.id.replace(/[^\d]/g, ''), 10);
-    var s2 = parseInt(obj2.id.replace(/[^\d]/g, ''), 10);
-    return s1 === s2 ? 0 : s1 < s2 ? -1 : 1;
-  }
-
-  function resetHeaderLocations() {
-    var headers = $(".tocify-header").sort(sortDescending);
-    $.each(headers, function (index, item) {
-      $(item).insertBefore($("#toc ul:first-child"));
+    $('#input-search').on('keyup', function(e) {
+      if ($(this).val() === "") {
+        inactive(e);
+      } else {
+        search(e);
+      }
     });
   }
 
   function search(event) {
-    var sections = $('section, #toc .tocify-header');
-
-    searchInfo.hide();
     unhighlight();
+    searchResults.addClass('visible');
 
     // ESC clears the field
     if (event.keyCode === 27) this.value = '';
 
     if (this.value) {
-      sections.hide();
-      // results are sorted by score in descending order
       var results = index.search(this.value);
-
       if (results.length) {
-        resetHeaderLocations();
-        var lastRef;
-        $.each(results, function (index, item) {
-          if (item.score <= 0.0001) return; // remove low-score results
-          var itemRef = item.ref;
-          $('#section-' + itemRef).show();
-          // headers must be repositioned in the DOM
-          var closestHeader = refToHeader(itemRef);
-          if (lastRef) {
-            refToHeader(lastRef).insertBefore(closestHeader);
-          }
-          closestHeader.show();
-          lastRef = itemRef;
+        $.each(results, function (index, result) {
+          var header = $('.tocify-item[data-unique=' + result.ref + ']').closest('.tocify-header');
+          if (header.length > 0) header = header[0];
+          if (header) $("#" + header.id + " li a").append("<span>" + result.score + "</span>");
         });
-
-        // position first element. it wasn't positioned above if len > 1
-        if (results.length > 1) {
-          var firstRef = results[0].ref;
-          var secondRef = results[1].ref;
-          refToHeader(firstRef).insertBefore(refToHeader(secondRef));
-        }
-
         highlight.call(this);
       } else {
-        sections.show();
-        searchInfo.text('No Results Found for "' + this.value + '"').show();
+        searchResults.text('No Results Found for "' + this.value + '"').show();
       }
-    } else {
-      sections.show();
     }
-
-    // HACK trigger tocify height recalculation
-    $global.triggerHandler('scroll.tocify');
-    $global.triggerHandler('resize');
-  }
-
-  function active() {
-    search.call(this, {});
   }
 
   function inactive() {
     unhighlight();
-    searchInfo.hide();
+    searchResults.removeClass('visible');
   }
 
   function highlight() {
diff --git a/source/javascripts/app/toc.js b/source/javascripts/app/toc.js
index 8946f87a83e..779e37e7655 100644
--- a/source/javascripts/app/toc.js
+++ b/source/javascripts/app/toc.js
@@ -15,7 +15,7 @@
       hideEffectSpeed: 180,
       ignoreSelector: '.toc-ignore',
       highlightOffset: 60,
-      scrollTo: -2,
+      scrollTo: -1,
       scrollHistory: true,
       hashGenerator: function (text, element) {
         return element.prop('id');
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index 1e8f3950cc8..296aaddb328 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -64,7 +64,7 @@ under the License.
         <div class="search">
           <input type="text" class="search" id="input-search">
         </div>
-        <div class="search-info"></div>
+        <div class="search-results"></div>
       <% end %>
       <div id="toc">
       </div>
diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss
index 23873d70224..a8eef52d296 100644
--- a/source/stylesheets/screen.css.scss
+++ b/source/stylesheets/screen.css.scss
@@ -41,6 +41,13 @@ html, body {
 // TABLE OF CONTENTS
 ////////////////////////////////////////////////////////////////////////////////
 
+#toc > ul > li > a > span {
+  float: right;
+  background-color: #2484FF;
+  border-radius: 40px;
+  width: 20px;
+}
+
 .tocify-wrapper {
   @include transition(left ease-in-out 0.3s);
   overflow-y: auto;
@@ -98,7 +105,7 @@ html, body {
     margin-top: $logo-margin;
   }
 
-  .search-info {
+  .search-results {
     margin-top: 0;
     padding: 1em $nav-padding;
     font-size: 0.9em;
@@ -303,187 +310,183 @@ html, body {
   position: relative;
   z-index: 30;
 
-  &, section {
-    padding-bottom: 6em;
-    &:after {
-      content: '';
-      display: block;
-      clear: both;
-    }
+  &:after {
+    content: '';
+    display: block;
+    clear: both;
+  }
 
-    &>h1, &>h2, &>h3, &>h4, &>h5, &>h6, &>p, &>table, &>ul, &>ol, &>aside, &>dl {
-      margin-right: $examples-width;
-      padding: 0 $main-padding;
-      @include box-sizing(border-box);
-      display: block;
-      @include text-shadow($main-embossed-text-shadow);
+  &>h1, &>h2, &>h3, &>h4, &>h5, &>h6, &>p, &>table, &>ul, &>ol, &>aside, &>dl {
+    margin-right: $examples-width;
+    padding: 0 $main-padding;
+    @include box-sizing(border-box);
+    display: block;
+    @include text-shadow($main-embossed-text-shadow);
 
-      @extend %left-col;
-    }
+    @extend %left-col;
+  }
 
-    &>ul, &>ol {
-      padding-left: $main-padding + 15px;
-    }
+  &>ul, &>ol {
+    padding-left: $main-padding + 15px;
+  }
 
-    // the div is the tocify hidden div for placeholding stuff
-    &>h1, &>h2, &>div {
-      clear:both;
-    }
+  // the div is the tocify hidden div for placeholding stuff
+  &>h1, &>h2, &>div {
+    clear:both;
+  }
 
-    h1 {
-      @extend %header-font;
-      font-size: 30px;
-      padding-top: 0.5em;
-      padding-bottom: 0.5em;
-      border-bottom: 1px solid #ccc;
-      margin-bottom: $h1-margin-bottom;
-      margin-top: 0;
-      border-top: 1px solid #ddd;
-      @include background-image(
-        linear-gradient(top, #fff, #f9f9f9)
-      );
-    }
+  h1 {
+    @extend %header-font;
+    font-size: 30px;
+    padding-top: 0.5em;
+    padding-bottom: 0.5em;
+    border-bottom: 1px solid #ccc;
+    margin-bottom: $h1-margin-bottom;
+    margin-top: 2em;
+    border-top: 1px solid #ddd;
+    @include background-image(
+      linear-gradient(top, #fff, #f9f9f9)
+    );
+  }
 
-    &:first-child {
-      h1:first-child, div:first-child + h1 {
-        border-top-width: 0;
-      }
-    }
+  h1:first-child, div:first-child + h1 {
+    border-top-width: 0;
+    margin-top: 0;
+  }
 
-    h2 {
-      @extend %header-font;
-      font-size: 20px;
-      margin-top: 4em;
-      margin-bottom: 0;
-      border-top: 1px solid #ccc;
-      padding-top: 1.2em;
-      padding-bottom: 1.2em;
-      @include background-image(
-        linear-gradient(top, rgba(#fff,0.4), rgba(#fff, 0))
-      );
-    }
+  h2 {
+    @extend %header-font;
+    font-size: 20px;
+    margin-top: 4em;
+    margin-bottom: 0;
+    border-top: 1px solid #ccc;
+    padding-top: 1.2em;
+    padding-bottom: 1.2em;
+    @include background-image(
+      linear-gradient(top, rgba(#fff,0.4), rgba(#fff, 0))
+    );
+  }
 
-    // h2s right after h1s should bump right up
-    // against the h1s.
-    h1 + h2, h1 + div + h2 {
-      margin-top: $h1-margin-bottom * -1;
-      border-top: none;
-    }
+  // h2s right after h1s should bump right up
+  // against the h1s.
+  h1 + h2, h1 + div + h2 {
+    margin-top: $h1-margin-bottom * -1;
+    border-top: none;
+  }
 
-    h3, h4, h5, h6 {
-      @extend %header-font;
-      font-size: 12px;
-      margin-top: 2.5em;
-      margin-bottom: 0.8em;
-      text-transform: uppercase;
-    }
+  h3, h4, h5, h6 {
+    @extend %header-font;
+    font-size: 12px;
+    margin-top: 2.5em;
+    margin-bottom: 0.8em;
+    text-transform: uppercase;
+  }
 
-    h4, h5, h6 {
-      font-size: 10px;
-    }
+  h4, h5, h6 {
+    font-size: 10px;
+  }
 
-    hr {
-      margin: 2em 0;
-      border-top: 2px solid $examples-bg;
-      border-bottom: 2px solid $main-bg;
-    }
+  hr {
+    margin: 2em 0;
+    border-top: 2px solid $examples-bg;
+    border-bottom: 2px solid $main-bg;
+  }
 
-    table {
-      margin-bottom: 1em;
-      overflow: auto;
-      th,td {
-        text-align: left;
-        vertical-align: top;
-        line-height: 1.6;
-      }
-
-      th {
-        padding: 5px 10px;
-        border-bottom: 1px solid #ccc;
-        vertical-align: bottom;
-      }
-
-      td {
-        padding: 10px;
-      }
-
-      tr:last-child {
-        border-bottom: 1px solid #ccc;
-      }
-
-      tr:nth-child(odd)>td {
-        background-color: lighten($main-bg,4.2%);
-      }
-
-      tr:nth-child(even)>td {
-        background-color: lighten($main-bg,2.4%);
-      }
+  table {
+    margin-bottom: 1em;
+    overflow: auto;
+    th,td {
+      text-align: left;
+      vertical-align: top;
+      line-height: 1.6;
     }
 
-    dt {
-      font-weight: bold;
+    th {
+      padding: 5px 10px;
+      border-bottom: 1px solid #ccc;
+      vertical-align: bottom;
     }
 
-    dd {
-      margin-left: 15px;
+    td {
+      padding: 10px;
     }
 
-    p, li, dt, dd {
-      line-height: 1.6;
-      margin-top: 0;
+    tr:last-child {
+      border-bottom: 1px solid #ccc;
     }
 
-    img {
-      max-width: 100%;
+    tr:nth-child(odd)>td {
+      background-color: lighten($main-bg,4.2%);
     }
 
-    code {
-      background-color: rgba(0,0,0,0.05);
-      padding: 3px;
-      border-radius: 3px;
-      @extend %break-words;
-      @extend %code-font;
+    tr:nth-child(even)>td {
+      background-color: lighten($main-bg,2.4%);
     }
+  }
 
-    aside {
-      padding-top: 1em;
-      padding-bottom: 1em;
-      text-shadow: 0 1px 0 lighten($aside-notice-bg, 15%);
-      margin-top: 1.5em;
-      margin-bottom: 1.5em;
-      background: $aside-notice-bg;
-      line-height: 1.6;
+  dt {
+    font-weight: bold;
+  }
 
-      &.warning {
-        background-color: $aside-warning-bg;
-        text-shadow: 0 1px 0 lighten($aside-warning-bg, 15%);
-      }
+  dd {
+    margin-left: 15px;
+  }
 
-      &.success {
-        background-color: $aside-success-bg;
-        text-shadow: 0 1px 0 lighten($aside-success-bg, 15%);
-      }
-    }
+  p, li, dt, dd {
+    line-height: 1.6;
+    margin-top: 0;
+  }
 
-    aside:before {
-      vertical-align: middle;
-      padding-right: 0.5em;
-      font-size: 14px;
-    }
+  img {
+    max-width: 100%;
+  }
 
-    aside.notice:before {
-      @extend %icon-info-sign;
-    }
+  code {
+    background-color: rgba(0,0,0,0.05);
+    padding: 3px;
+    border-radius: 3px;
+    @extend %break-words;
+    @extend %code-font;
+  }
+
+  aside {
+    padding-top: 1em;
+    padding-bottom: 1em;
+    text-shadow: 0 1px 0 lighten($aside-notice-bg, 15%);
+    margin-top: 1.5em;
+    margin-bottom: 1.5em;
+    background: $aside-notice-bg;
+    line-height: 1.6;
 
-    aside.warning:before {
-      @extend %icon-exclamation-sign;
+    &.warning {
+      background-color: $aside-warning-bg;
+      text-shadow: 0 1px 0 lighten($aside-warning-bg, 15%);
     }
 
-    aside.success:before {
-      @extend %icon-ok-sign;
+    &.success {
+      background-color: $aside-success-bg;
+      text-shadow: 0 1px 0 lighten($aside-success-bg, 15%);
     }
   }
 
+  aside:before {
+    vertical-align: middle;
+    padding-right: 0.5em;
+    font-size: 14px;
+  }
+
+  aside.notice:before {
+    @extend %icon-info-sign;
+  }
+
+  aside.warning:before {
+    @extend %icon-exclamation-sign;
+  }
+
+  aside.success:before {
+    @extend %icon-ok-sign;
+  }
+
   .search-highlight {
     padding: 2px;
     margin: -2px;

From 1b1427c3eea148b6afda7a1446cb47e06df8b160 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Wed, 2 Jul 2014 22:46:14 -0700
Subject: [PATCH 31/36] Add placeholder to search box

---
 source/layouts/layout.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index 296aaddb328..960975418b9 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -62,7 +62,7 @@ under the License.
       <% end %>
       <% if current_page.data.search %>
         <div class="search">
-          <input type="text" class="search" id="input-search">
+          <input type="text" class="search" id="input-search" placeholder="Search">
         </div>
         <div class="search-results"></div>
       <% end %>

From 51e537aca2e05a6c1ac4ee950b1ebbba422dae57 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Wed, 2 Jul 2014 23:38:17 -0700
Subject: [PATCH 32/36] Simplify embossed tocify styles, in preperation for
 search

---
 source/stylesheets/screen.css.scss | 71 ++++++++++++++++++++----------
 source/stylesheets/variables.scss  |  5 ++-
 2 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss
index a8eef52d296..d8601bd724b 100644
--- a/source/stylesheets/screen.css.scss
+++ b/source/stylesheets/screen.css.scss
@@ -48,6 +48,24 @@ html, body {
   width: 20px;
 }
 
+@mixin embossed-bg {
+  @include background(
+    linear-gradient(top,
+                    rgba(#000, 0.2),
+                    rgba(#000, 0) 8px),
+    linear-gradient(bottom,
+                    rgba(#000, 0.2),
+                    rgba(#000, 0) 8px),
+    linear-gradient(top,
+                    rgba($nav-embossed-border-top, 1),
+                    rgba($nav-embossed-border-top, 0) 1.5px),
+    linear-gradient(bottom,
+                    rgba($nav-embossed-border-bottom, 1),
+                    rgba($nav-embossed-border-bottom, 0) 1.5px),
+    $nav-subitem-bg
+  );
+}
+
 .tocify-wrapper {
   @include transition(left ease-in-out 0.3s);
   overflow-y: auto;
@@ -85,7 +103,7 @@ html, body {
       border-color: $search-box-border-color;
       padding: 6px 0 6px 20px;
       @include box-sizing(border-box);
-      margin: 10px 15px;
+      margin: $nav-v-padding $nav-padding;
       width: $nav-width - 30;
       outline: none;
       color: $nav-text;
@@ -95,7 +113,7 @@ html, body {
     &:before {
       position: absolute;
       top: 17px;
-      left: 15px;
+      left: $nav-padding;
       color: $nav-text;
       @extend %icon-search;
     }
@@ -107,14 +125,32 @@ html, body {
 
   .search-results {
     margin-top: 0;
-    padding: 1em $nav-padding;
-    font-size: 0.9em;
-    font-weight: bold;
-    text-shadow: 0 1px 0 lighten($search-notice-bg, 15%);
-    background: $search-notice-bg;
-    display: none;
-
     @include box-sizing(border-box);
+    height: 0;
+    overflow: hidden;
+    @include transition-property(height margin);
+    @include transition-duration(180ms);
+    @include transition-timing-function(ease-in-out);
+    &.visible {
+      height: 30%;
+      margin-bottom: 1em;
+    }
+
+    @include embossed-bg;
+
+    li {
+      margin: 1em $nav-padding;
+      line-height: 1;
+    }
+
+    a {
+      color: $nav-text;
+      text-decoration: none;
+
+      &:hover {
+        text-decoration: underline;
+      }
+    }
   }
 
 
@@ -156,25 +192,14 @@ html, body {
     display: none; // tocify will override this when needed
     background-color: $nav-subitem-bg;
     font-weight: 500;
-    @include background-image(
-      linear-gradient(top,
-                      darken($nav-subitem-bg,2%),
-                      $nav-subitem-bg 10%,
-                      $nav-subitem-bg 90%,
-                      darken($nav-subitem-bg,2%))
-    );
     .tocify-item>a {
       padding-left: $nav-padding + $nav-indent;
       font-size: 12px;
     }
-    // These items make for a slight embossed look for the subheader.
-    // "Why not put the borders in the subheader?" you ask.
-    // "Because then the animation isn't as smooth," I reply.
-    &>li:first-child {
-      border-top: $nav-embossed-border-top;
-    }
+
+    // for embossed look:
+    @include embossed-bg;
     &>li:last-child {
-      border-bottom: $nav-embossed-border-bottom;
       box-shadow: none; // otherwise it'll overflow out of the subheader
     }
   }
diff --git a/source/stylesheets/variables.scss b/source/stylesheets/variables.scss
index 588239a4547..d2ce0116a81 100644
--- a/source/stylesheets/variables.scss
+++ b/source/stylesheets/variables.scss
@@ -57,6 +57,7 @@ $examples-width: 50%; // portion of the screen taken up by code examples
 $logo-margin: 20px; // margin between nav items and logo, ignored if search is active
 $main-padding: 28px; // padding to left and right of content & examples
 $nav-padding: 15px; // padding to left and right of navbar
+$nav-v-padding: 10px; // padding used vertically around search boxes and results
 $nav-indent: 10px; // extra padding for ToC subitems
 $code-annotation-padding: 13px; // padding inside code annotations
 $h1-margin-bottom: 21px; // padding under the largest header tags
@@ -86,8 +87,8 @@ $phone-width: $tablet-width - $nav-width; // min width before reverting to mobil
 ////////////////////
 $nav-active-shadow: #000;
 $nav-footer-border-color: #666;
-$nav-embossed-border-top: 1px solid #000;
-$nav-embossed-border-bottom: 1px solid #404040;
+$nav-embossed-border-top: #000;
+$nav-embossed-border-bottom: #939393;
 $main-embossed-text-shadow: 0px 1px 0px #fff;
 $search-box-border-color: #666;
 

From 18cd104883e870aa10e159c2300b56de3bcbea68 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Wed, 2 Jul 2014 23:43:25 -0700
Subject: [PATCH 33/36] Add better search results in a sliding search results
 area

---
 source/javascripts/app/search.js | 32 +++++++++++++-------------------
 source/layouts/layout.erb        |  5 ++++-
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/source/javascripts/app/search.js b/source/javascripts/app/search.js
index 55c222ff15e..cb81989dc28 100644
--- a/source/javascripts/app/search.js
+++ b/source/javascripts/app/search.js
@@ -15,9 +15,9 @@
   $(bind);
 
   function populate() {
-    $('h1').each(function() {
+    $('h1, h2').each(function() {
       var title = $(this);
-      var body = title.nextUntil('h1');
+      var body = title.nextUntil('h1, h2');
       index.add({
         id: title.prop('id'),
         title: title.text(),
@@ -31,13 +31,7 @@
     darkBox = $('.dark-box');
     searchResults = $('.search-results');
 
-    $('#input-search').on('keyup', function(e) {
-      if ($(this).val() === "") {
-        inactive(e);
-      } else {
-        search(e);
-      }
-    });
+    $('#input-search').on('keyup', search);
   }
 
   function search(event) {
@@ -48,25 +42,25 @@
     if (event.keyCode === 27) this.value = '';
 
     if (this.value) {
-      var results = index.search(this.value);
+      var results = index.search(this.value).filter(function(r) {
+        return r.score > 0.0001;
+      });
+
       if (results.length) {
+        searchResults.empty();
         $.each(results, function (index, result) {
-          var header = $('.tocify-item[data-unique=' + result.ref + ']').closest('.tocify-header');
-          if (header.length > 0) header = header[0];
-          if (header) $("#" + header.id + " li a").append("<span>" + result.score + "</span>");
+          searchResults.append("<li><a href='#" + result.ref + "'>" + $('#'+result.ref).text() + "</a></li>");
         });
         highlight.call(this);
       } else {
-        searchResults.text('No Results Found for "' + this.value + '"').show();
+        searchResults.html('<li>No Results Found for "' + this.value + '"</li>');
       }
+    } else {
+      unhighlight();
+      searchResults.removeClass('visible');
     }
   }
 
-  function inactive() {
-    unhighlight();
-    searchResults.removeClass('visible');
-  }
-
   function highlight() {
     if (this.value) content.highlight(this.value, highlightOpts);
   }
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index 960975418b9..c28d88dbdef 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -64,7 +64,10 @@ under the License.
         <div class="search">
           <input type="text" class="search" id="input-search" placeholder="Search">
         </div>
-        <div class="search-results"></div>
+        <ul class="search-results">
+          <li><a href="#">Introduction</a></li>
+          <li><a href="#">Cats</a></li>
+        </ul>
       <% end %>
       <div id="toc">
       </div>

From 395502b15204372d795fa57c932df4e6090949e0 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Thu, 3 Jul 2014 00:01:48 -0700
Subject: [PATCH 34/36] Add changelog

---
 CHANGELOG.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000000..9e32c8a4740
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,20 @@
+# Changelog
+
+## Version 1.0
+
+*July 2, 2014* [view issues](https://github.com/tripit/slate/issues?milestone=1&state=closed)
+
+**Features:**
+
+- Responsive designs for phones and tablets
+- Started tagging versions
+
+**Fixes:**
+
+- Fixed 'unrecognized expression' error
+- Fixed #undefined hash bug
+- Fixed bug where the current language tab would be unselected
+- Fixed bug where tocify wouldn't highlight the current section while searching
+- Fixed bug where ids of header tags would have special characters that caused problems
+- Updated layout so that pages with disabled search wouldn't load search.js
+- Cleaned up Javascript
\ No newline at end of file

From 512b57d799898a0a748580bd0d0ef1a075516ab4 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Thu, 3 Jul 2014 00:05:23 -0700
Subject: [PATCH 35/36] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e32c8a4740..01bef8f23b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,9 @@
 
 ## Version 1.0
 
-*July 2, 2014* [view issues](https://github.com/tripit/slate/issues?milestone=1&state=closed)
+*July 2, 2014*
+
+[View Issues](https://github.com/tripit/slate/issues?milestone=1&state=closed)
 
 **Features:**
 
@@ -17,4 +19,4 @@
 - Fixed bug where tocify wouldn't highlight the current section while searching
 - Fixed bug where ids of header tags would have special characters that caused problems
 - Updated layout so that pages with disabled search wouldn't load search.js
-- Cleaned up Javascript
\ No newline at end of file
+- Cleaned up Javascript

From 60d1dbd37d0b377e5c714bbefb0fc6d466fbc175 Mon Sep 17 00:00:00 2001
From: Robert Lord <robert@lord.io>
Date: Thu, 3 Jul 2014 00:07:44 -0700
Subject: [PATCH 36/36] Update search results to scroll, remove initial dummy
 text

---
 source/layouts/layout.erb          | 5 +----
 source/stylesheets/screen.css.scss | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index c28d88dbdef..915505b0405 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -64,10 +64,7 @@ under the License.
         <div class="search">
           <input type="text" class="search" id="input-search" placeholder="Search">
         </div>
-        <ul class="search-results">
-          <li><a href="#">Introduction</a></li>
-          <li><a href="#">Cats</a></li>
-        </ul>
+        <ul class="search-results"></ul>
       <% end %>
       <div id="toc">
       </div>
diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss
index d8601bd724b..99f1a5e8993 100644
--- a/source/stylesheets/screen.css.scss
+++ b/source/stylesheets/screen.css.scss
@@ -127,7 +127,8 @@ html, body {
     margin-top: 0;
     @include box-sizing(border-box);
     height: 0;
-    overflow: hidden;
+    overflow-y: auto;
+    overflow-x: hidden;
     @include transition-property(height margin);
     @include transition-duration(180ms);
     @include transition-timing-function(ease-in-out);