final version of toc

Signed-off-by: José Valim <jose.valim@plataformatec.com.br>

Author: eksperimental

_includes/bottom.html

@@ -42,4 +42,4 @@
 
   </script>
 </body>
-</html>
+</html>

css/style.css

@@ -848,13 +848,24 @@ li.image {
 /* table of contents */
 /*  Jekyll Table of Contents 
 ----------------------------------------------------- */
-.jekyll-toc ol { counter-reset: item; }
-.jekyll-toc ol li { display: block }
-.jekyll-toc ol li:before {
+ol.jekyll-toc,
+ol.jekyll-toc ol {
+  counter-reset: item;
+}
+
+ol.jekyll-toc {
+  margin: 0.3125em 0 0 3.125em;
+}
+ol.jekyll-toc ol {
+  margin: 0.625em 0 0 0;
+  margin-bottom: -0.8em;
+}
+ol.jekyll-toc li { display: block }
+ol.jekyll-toc li:before {
   content: counters(item, ".") " ";
   counter-increment: item;
 }
-.jekyll-toc ol li {
+ol.jekyll-toc li {
   list-style-position: inside;
   text-indent: -1em;
   padding-left: 1em;
@@ -910,13 +921,11 @@ li.image {
   margin-left: 10px;
   width:1em;
   text-align: right;
-  /* vertical-align: top; */
 }
 
 /* extending jekyll-toc */
-.icon {
+.jekyll-toc-header .icon {
   font: normal normal normal 16px/1 icons !important;
-  /* display: inline-block; */
   text-decoration: none;
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
@@ -925,12 +934,4 @@ li.image {
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
-}
-
-/* dev */
-/*
-.jekyll-toc-header {border:1px solid red; background-color:yellow;}
-.jekyll-toc-header a.jekyll-toc-anchor {border:1px solid blue;}
-.jekyll-toc-header a.jekyll-toc-anchor a.jekyll-toc-icon{border:1px solid red;}
-}
-*/
+}

js/toc/toc.js

@@ -69,7 +69,7 @@
       window.location.hash = hash;
     }
 
-    function update_hash(hash) { 
+    function update_hash(hash) {
       if(history.pushState) {
         history.pushState(null, null, '#'+hash);
       } else {
@@ -78,8 +78,13 @@
     }
 
     function animate_link_here(header_id) {
-      update_hash( (typeof header_id === "undefined") ? '' : header_id );
-      $('html,body').animate({scrollTop:$(document.getElementById(header_id)).offset().top}, settings.linkHereDuration);
+      var hash = (typeof header_id === "undefined") ? '' : header_id;
+      if ( settings.linkHereDuration > 0 ) {
+        update_hash(hash);
+        $('html,body').animate({scrollTop:$(document.getElementById(header_id)).offset().top}, settings.linkHereDuration);
+      } else {
+        force_update_hash(hash);
+      }
     }
 
     if (settings.backToTop) {
@@ -94,11 +99,12 @@
         } else {
           var top_element = ( $(settings.backToTopSelector).length ) ? $(settings.backToTopSelector).first() : $('html, body');
           var top_element_id = $(top_element).attr('id');
-          update_hash ( (typeof top_element_id === "undefined") ? '' : top_element_id );
-          if ( settings.backToTopDuration > 0 || window.location.hash == '' ) {
+          var hash = (typeof top_element_id === "undefined") ? '' : top_element_id
+          if ( settings.backToTopDuration > 0 || hash == '' ) {
+            update_hash(hash);
             $('html, body').animate({scrollTop: top_element.offset().top}, settings.backToTopDuration);
           } else {
-            force_update_hash(window.location.hash);
+            force_update_hash(hash);
           }
         }
       });