From 5af09bc6f6e3233b9429ec5e8cd0a6db6debbf76 Mon Sep 17 00:00:00 2001
From: toshimaru <me@toshimaru.net>
Date: Tue, 19 Feb 2019 04:18:49 +0900
Subject: [PATCH 01/10] Add jekyll toc

---
 Gemfile      | 1 +
 Gemfile.lock | 3 +++
 _config.yml  | 1 +
 3 files changed, 5 insertions(+)

diff --git a/Gemfile b/Gemfile
index 894f47287d..fc4b4e8b40 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,4 +4,5 @@ gem 'rake'
 
 group :jekyll_plugins do
   gem 'github-pages'
+  gem 'jekyll-toc'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 7a080f5e10..9b0b69242b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -185,6 +185,8 @@ GEM
       jekyll-seo-tag (~> 2.0)
     jekyll-titles-from-headings (0.5.1)
       jekyll (~> 3.3)
+    jekyll-toc (0.9.1)
+      nokogiri (~> 1.8)
     jekyll-watch (2.1.2)
       listen (~> 3.0)
     jemoji (0.10.2)
@@ -244,6 +246,7 @@ PLATFORMS
 
 DEPENDENCIES
   github-pages
+  jekyll-toc
   rake
 
 BUNDLED WITH
diff --git a/_config.yml b/_config.yml
index 8130c1eca4..3c37611ecc 100644
--- a/_config.yml
+++ b/_config.yml
@@ -13,3 +13,4 @@ defaults:
       path: ""
     values:
       image: https://avatars.githubusercontent.com/u/4223
+      toc: true

From 5f97648cf6f866fea173e7d7904a3c45236b690b Mon Sep 17 00:00:00 2001
From: toshimaru <me@toshimaru.net>
Date: Sat, 23 Mar 2019 18:58:18 +0900
Subject: [PATCH 02/10] Update jekyll-toc

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9b0b69242b..b535a09864 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -185,8 +185,8 @@ GEM
       jekyll-seo-tag (~> 2.0)
     jekyll-titles-from-headings (0.5.1)
       jekyll (~> 3.3)
-    jekyll-toc (0.9.1)
-      nokogiri (~> 1.8)
+    jekyll-toc (0.10.0)
+      nokogiri (~> 1.9)
     jekyll-watch (2.1.2)
       listen (~> 3.0)
     jemoji (0.10.2)

From 70a378d7844cf86ec9b3ffee277295af7a930b3b Mon Sep 17 00:00:00 2001
From: toshimaru <me@toshimaru.net>
Date: Sat, 23 Mar 2019 18:58:41 +0900
Subject: [PATCH 03/10] Set toc levels limit

---
 _config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/_config.yml b/_config.yml
index 3c37611ecc..182369f204 100644
--- a/_config.yml
+++ b/_config.yml
@@ -8,6 +8,9 @@ plugins:
   - jekyll-sitemap
 twitter:
   card: summary
+toc:
+  min_level: 2
+  max_level: 5
 defaults:
   - scope:
       path: ""

From 3c16b10d5a0d2e7802f77ebd8ee3f172de384392 Mon Sep 17 00:00:00 2001
From: toshimaru <me@toshimaru.net>
Date: Sun, 31 Mar 2019 18:50:24 +0900
Subject: [PATCH 04/10] Add toc tag

---
 src/_layouts/default.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/_layouts/default.html b/src/_layouts/default.html
index 93bbd0ebee..dfface27be 100644
--- a/src/_layouts/default.html
+++ b/src/_layouts/default.html
@@ -41,11 +41,11 @@
         </div>
       </nav>
 
-      <!-- <div class="col-12 col-md-3 col-xl-2 bg-light toc-content">
-        <div>toc-content!</div>
-      </div> -->
+      <div class="col-12 col-md-3 col-xl-2 toc-content">
+        <div>{% toc %}</div>
+      </div>
 
-      <main role="main" class="col-12 col-md-9 col-xl-10 py-md-3 pl-md-5">
+      <main role="main" class="col-12 col-md-9 col-xl-8 py-md-3 pl-md-5">
         {{ content }}
         <footer class="site-footer">
           <!-- <span class="site-footer-credits">This page was generated by <a href="https://pages.github.com">GitHub Pages</a>.</span> -->

From adb9511e109658f49375862b934fb200f214213e Mon Sep 17 00:00:00 2001
From: toshimaru <me@toshimaru.net>
Date: Sun, 31 Mar 2019 19:03:55 +0900
Subject: [PATCH 05/10] gem 'jekyll-toc', '0.12.0.rc3'

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index fc4b4e8b40..fa477141aa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,5 +4,5 @@ gem 'rake'
 
 group :jekyll_plugins do
   gem 'github-pages'
-  gem 'jekyll-toc'
+  gem 'jekyll-toc', '0.12.0.rc3'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index b535a09864..0672c3beb3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -185,7 +185,7 @@ GEM
       jekyll-seo-tag (~> 2.0)
     jekyll-titles-from-headings (0.5.1)
       jekyll (~> 3.3)
-    jekyll-toc (0.10.0)
+    jekyll-toc (0.12.0.rc3)
       nokogiri (~> 1.9)
     jekyll-watch (2.1.2)
       listen (~> 3.0)
@@ -246,7 +246,7 @@ PLATFORMS
 
 DEPENDENCIES
   github-pages
-  jekyll-toc
+  jekyll-toc (= 0.12.0.rc3)
   rake
 
 BUNDLED WITH

From f0f9ebb8bd7c3bc718f2861fec5a99028ae02bff Mon Sep 17 00:00:00 2001
From: toshimaru <me@toshimaru.net>
Date: Tue, 2 Apr 2019 04:58:41 +0900
Subject: [PATCH 06/10] jekyll-toc update

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index fa477141aa..fc4b4e8b40 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,5 +4,5 @@ gem 'rake'
 
 group :jekyll_plugins do
   gem 'github-pages'
-  gem 'jekyll-toc', '0.12.0.rc3'
+  gem 'jekyll-toc'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 0672c3beb3..3233e00d1f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -185,7 +185,7 @@ GEM
       jekyll-seo-tag (~> 2.0)
     jekyll-titles-from-headings (0.5.1)
       jekyll (~> 3.3)
-    jekyll-toc (0.12.0.rc3)
+    jekyll-toc (0.12.0)
       nokogiri (~> 1.9)
     jekyll-watch (2.1.2)
       listen (~> 3.0)
@@ -207,7 +207,7 @@ GEM
       jekyll-seo-tag (~> 2.1)
     minitest (5.11.3)
     multipart-post (2.0.0)
-    nokogiri (1.10.1)
+    nokogiri (1.10.2)
       mini_portile2 (~> 2.4.0)
     octokit (4.13.0)
       sawyer (~> 0.8.0, >= 0.5.3)
@@ -246,7 +246,7 @@ PLATFORMS
 
 DEPENDENCIES
   github-pages
-  jekyll-toc (= 0.12.0.rc3)
+  jekyll-toc
   rake
 
 BUNDLED WITH

From 2fac818f8ec74999887d1f009a37e2c0ac85c275 Mon Sep 17 00:00:00 2001
From: toshimaru <me@toshimaru.net>
Date: Tue, 2 Apr 2019 04:59:13 +0900
Subject: [PATCH 07/10] Update style

---
 src/_layouts/default.html |  4 ++--
 src/_sass/railsdoc.scss   | 23 ++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/_layouts/default.html b/src/_layouts/default.html
index dfface27be..e3cbf8758e 100644
--- a/src/_layouts/default.html
+++ b/src/_layouts/default.html
@@ -41,8 +41,8 @@
         </div>
       </nav>
 
-      <div class="col-12 col-md-3 col-xl-2 toc-content">
-        <div>{% toc %}</div>
+      <div class="col-12 col-md-3 col-xl-2 toc-content-sticky">
+        <div class="toc-content">{% toc %}</div>
       </div>
 
       <main role="main" class="col-12 col-md-9 col-xl-8 py-md-3 pl-md-5">
diff --git a/src/_sass/railsdoc.scss b/src/_sass/railsdoc.scss
index e3163ae20c..9df44298a1 100644
--- a/src/_sass/railsdoc.scss
+++ b/src/_sass/railsdoc.scss
@@ -44,11 +44,32 @@ code {
   }
 }
 
-.toc-content {
+.toc-content-sticky {
   position: sticky;
   order: 2;
+  top: $navbar-height;
+  height: calc(100vh - #{$navbar-height});
   z-index: 100; /* Behind the navbar */
   box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1);
+
+  .toc-content {
+    padding-top: 20px;
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+}
+
+.section-nav {
+  padding-left: 0;
+  border-left: 1px solid #eee;
+  
+  ul {
+    padding-left: 1rem;
+  }
+}
+
+.toc-entry {
+  display: block;
 }
 
 .sidebar-content {

From bc7ec22d9fbf7702e7cceec56ff4277a9f8db928 Mon Sep 17 00:00:00 2001
From: toshimaru <me@toshimaru.net>
Date: Tue, 16 Apr 2019 02:05:03 +0900
Subject: [PATCH 08/10] toc styling

---
 src/_sass/railsdoc.scss | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/_sass/railsdoc.scss b/src/_sass/railsdoc.scss
index 9df44298a1..d3fb809f36 100644
--- a/src/_sass/railsdoc.scss
+++ b/src/_sass/railsdoc.scss
@@ -60,12 +60,21 @@ code {
 }
 
 .section-nav {
-  padding-left: 0;
+  padding-left: 1rem;
   border-left: 1px solid #eee;
   
   ul {
     padding-left: 1rem;
   }
+
+  a {
+    color: rgba(0, 0, 0, .8);
+
+    &:hover {
+      color: $dark-red;
+      text-decoration: none;
+    }
+  }
 }
 
 .toc-entry {

From 13d799410b78c2d219b5a7ef38f273b75346d408 Mon Sep 17 00:00:00 2001
From: toshimaru <me@toshimaru.net>
Date: Tue, 16 Apr 2019 02:09:29 +0900
Subject: [PATCH 09/10] Update rails submodule

---
 rails | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rails b/rails
index 94b5cd3a20..b9ca94caea 160000
--- a/rails
+++ b/rails
@@ -1 +1 @@
-Subproject commit 94b5cd3a20edadd6f6b8cf0bdf1a4d4919df86cb
+Subproject commit b9ca94caea2ca6a6cc09abaffaad67b447134079

From ce5d40a831a682fab2684c548b2a7ad8861f7996 Mon Sep 17 00:00:00 2001
From: toshimaru <me@toshimaru.net>
Date: Tue, 16 Apr 2019 02:09:42 +0900
Subject: [PATCH 10/10] Update jekyll-toc

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3233e00d1f..f1efe4db6c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -185,7 +185,7 @@ GEM
       jekyll-seo-tag (~> 2.0)
     jekyll-titles-from-headings (0.5.1)
       jekyll (~> 3.3)
-    jekyll-toc (0.12.0)
+    jekyll-toc (0.12.1)
       nokogiri (~> 1.9)
     jekyll-watch (2.1.2)
       listen (~> 3.0)