From a1a07db5086eb5666e2c2daa4b6670ce5e2795ae Mon Sep 17 00:00:00 2001
From: CaptainIRS <36656347+CaptainIRS@users.noreply.github.com>
Date: Thu, 22 Apr 2021 14:22:39 +0530
Subject: [PATCH 1/3] Change DOM order of left sidebar

---
 lib/templates/html/404error.html           | 12 ++++++------
 lib/templates/html/category.html           | 13 +++++++------
 lib/templates/html/class.html              | 12 ++++++------
 lib/templates/html/constructor.html        | 12 ++++++------
 lib/templates/html/enum.html               | 12 ++++++------
 lib/templates/html/extension.html          | 12 ++++++------
 lib/templates/html/function.html           | 12 ++++++------
 lib/templates/html/index.html              | 12 ++++++------
 lib/templates/html/library.html            | 12 ++++++------
 lib/templates/html/method.html             | 12 ++++++------
 lib/templates/html/mixin.html              | 12 ++++++------
 lib/templates/html/property.html           | 12 ++++++------
 lib/templates/html/top_level_property.html | 12 ++++++------
 lib/templates/html/typedef.html            | 12 ++++++------
 14 files changed, 85 insertions(+), 84 deletions(-)

diff --git a/lib/templates/html/404error.html b/lib/templates/html/404error.html
index 06ea358d13..2226bf8f8f 100644
--- a/lib/templates/html/404error.html
+++ b/lib/templates/html/404error.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5><span class="package-name">{{self.name}}</span> <span class="package-kind">{{self.kind}}</span></h5>
-    {{>packages}}
-  </div>
-
   <div id="dartdoc-main-content" class="main-content">
     <h1>404: Something's gone wrong :-(</h1>
 
@@ -21,6 +15,12 @@ <h1>404: Something's gone wrong :-(</h1>
     </section>
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5><span class="package-name">{{self.name}}</span> <span class="package-kind">{{self.kind}}</span></h5>
+    {{>packages}}
+  </div>
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div>
 
diff --git a/lib/templates/html/category.html b/lib/templates/html/category.html
index 733f328fe2..a6fa813ddc 100644
--- a/lib/templates/html/category.html
+++ b/lib/templates/html/category.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-<div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-  {{>search_sidebar}}
-  <h5><span class="package-name">{{parent.name}}</span> <span class="package-kind">{{parent.kind}}</span></h5>
-  {{>packages}}
-</div>
-
 <div id="dartdoc-main-content" class="main-content">
   {{#self}}
   <h1><span class="kind-category">{{name}}</span> {{kind}}</h1>
@@ -121,6 +115,13 @@ <h2>Exceptions / Errors</h2>
   {{/self}}
 
 </div> <!-- /.main-content -->
+
+<div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+  {{>search_sidebar}}
+  <h5><span class="package-name">{{parent.name}}</span> <span class="package-kind">{{parent.kind}}</span></h5>
+  {{>packages}}
+</div>
+
 <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   <h5>{{self.name}} {{self.kind}}</h5>
   {{>sidebar_for_category}}
diff --git a/lib/templates/html/class.html b/lib/templates/html/class.html
index becc0bbd39..6506869089 100644
--- a/lib/templates/html/class.html
+++ b/lib/templates/html/class.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{{sidebarForLibrary}}}
-  </div>
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-class">{{{nameWithGenerics}}}</span> {{kind}} {{>feature_set}} {{>categorization}}</h1></div>
@@ -173,6 +167,12 @@ <h2>Constants</h2>
 
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{{sidebarForLibrary}}}
+  </div>
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
     {{{sidebarForContainer}}}
   </div><!--/.sidebar-offcanvas-->
diff --git a/lib/templates/html/constructor.html b/lib/templates/html/constructor.html
index dfacbd4a9c..ee126e65b2 100644
--- a/lib/templates/html/constructor.html
+++ b/lib/templates/html/constructor.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{{sidebarForContainer}}}
-  </div><!--/.sidebar-offcanvas-left-->
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-constructor">{{{nameWithGenerics}}}</span> {{kind}} {{>feature_set}}</h1></div>
@@ -33,6 +27,12 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
     {{/constructor}}
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{{sidebarForContainer}}}
+  </div><!--/.sidebar-offcanvas-left-->
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div><!--/.sidebar-offcanvas-->
 
diff --git a/lib/templates/html/enum.html b/lib/templates/html/enum.html
index 5ac76afc10..a229471674 100644
--- a/lib/templates/html/enum.html
+++ b/lib/templates/html/enum.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{{sidebarForLibrary}}}
-  </div>
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-enum">{{{name}}}</span> {{kind}} {{>feature_set}} {{>categorization}}</h1></div>
@@ -163,6 +157,12 @@ <h2>Static Methods</h2>
     {{/eNum}}
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{{sidebarForLibrary}}}
+  </div>
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
     {{{sidebarForContainer}}}
   </div><!--/.sidebar-offcanvas-->
diff --git a/lib/templates/html/extension.html b/lib/templates/html/extension.html
index 822703b3f2..d6f9229108 100644
--- a/lib/templates/html/extension.html
+++ b/lib/templates/html/extension.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-<div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{{sidebarForLibrary}}}
-</div>
-
 <div id="dartdoc-main-content" class="main-content">
     {{#self}}
     <div>{{>source_link}}<h1><span class="kind-class">{{{nameWithGenerics}}}</span> {{kind}} {{>feature_set}} {{>categorization}}</h1></div>
@@ -98,6 +92,12 @@ <h2>Constants</h2>
 
 </div> <!-- /.main-content -->
 
+<div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{{sidebarForLibrary}}}
+</div>
+
 <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
     {{{sidebarForContainer}}}
 </div><!--/.sidebar-offcanvas-->
diff --git a/lib/templates/html/function.html b/lib/templates/html/function.html
index dd6f517603..98d0071d57 100644
--- a/lib/templates/html/function.html
+++ b/lib/templates/html/function.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{{sidebarForLibrary}}}
-  </div><!--/.sidebar-offcanvas-left-->
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-function">{{{nameWithGenerics}}}</span> {{kind}} {{>feature_set}} {{>categorization}}</h1></div>
@@ -22,6 +16,12 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
     {{/function}}
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{{sidebarForLibrary}}}
+  </div><!--/.sidebar-offcanvas-left-->
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div><!--/.sidebar-offcanvas-->
 
diff --git a/lib/templates/html/index.html b/lib/templates/html/index.html
index 663884886d..319c07d293 100644
--- a/lib/templates/html/index.html
+++ b/lib/templates/html/index.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5 class="hidden-xs"><span class="package-name">{{self.name}}</span> <span class="package-kind">{{self.kind}}</span></h5>
-    {{>packages}}
-  </div>
-
   <div id="dartdoc-main-content" class="main-content">
     {{#defaultPackage}}
       {{>documentation}}
@@ -35,6 +29,12 @@ <h3>{{name}}</h3>
 
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5 class="hidden-xs"><span class="package-name">{{self.name}}</span> <span class="package-kind">{{self.kind}}</span></h5>
+    {{>packages}}
+  </div>
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div>
 
diff --git a/lib/templates/html/library.html b/lib/templates/html/library.html
index b683d187b0..831fb2ddd4 100644
--- a/lib/templates/html/library.html
+++ b/lib/templates/html/library.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5><span class="package-name">{{parent.name}}</span> <span class="package-kind">{{parent.kind}}</span></h5>
-    {{>packages}}
-  </div>
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-library">{{{name}}}</span> {{kind}} {{>feature_set}} {{>categorization}}</h1></div>
@@ -125,6 +119,12 @@ <h2>Exceptions / Errors</h2>
 
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5><span class="package-name">{{parent.name}}</span> <span class="package-kind">{{parent.kind}}</span></h5>
+    {{>packages}}
+  </div>
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
     <h5>{{self.name}} {{self.kind}}</h5>
     {{{sidebarForLibrary}}}
diff --git a/lib/templates/html/method.html b/lib/templates/html/method.html
index b9a1d5e9a1..d4b5dae36a 100644
--- a/lib/templates/html/method.html
+++ b/lib/templates/html/method.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{{sidebarForContainer}}}
-  </div><!--/.sidebar-offcanvas-->
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-method">{{{nameWithGenerics}}}</span> {{kind}} {{>feature_set}}</h1></div>
@@ -23,6 +17,12 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
     {{/method}}
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{{sidebarForContainer}}}
+  </div><!--/.sidebar-offcanvas-->
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div><!--/.sidebar-offcanvas-->
 
diff --git a/lib/templates/html/mixin.html b/lib/templates/html/mixin.html
index 2aeee419b9..531620633b 100644
--- a/lib/templates/html/mixin.html
+++ b/lib/templates/html/mixin.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{{sidebarForLibrary}}}
-  </div>
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-mixin">{{{nameWithGenerics}}}</span> {{kind}} {{>feature_set}} {{>categorization}}</h1></div>
@@ -172,6 +166,12 @@ <h2>Constants</h2>
     {{/mixin}}
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{{sidebarForLibrary}}}
+  </div>
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
     {{{sidebarForContainer}}}
   </div><!--/.sidebar-offcanvas-->
diff --git a/lib/templates/html/property.html b/lib/templates/html/property.html
index 5044c41c05..c6ebea13d0 100644
--- a/lib/templates/html/property.html
+++ b/lib/templates/html/property.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{{sidebarForContainer}}}
-  </div><!--/.sidebar-offcanvas-->
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-property">{{name}}</span> {{kind}} {{>feature_set}}</h1></div>
@@ -34,6 +28,12 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
     {{/self}}
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{{sidebarForContainer}}}
+  </div><!--/.sidebar-offcanvas-->
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div><!--/.sidebar-offcanvas-->
 
diff --git a/lib/templates/html/top_level_property.html b/lib/templates/html/top_level_property.html
index 7f9c734dc5..0e83b23a91 100644
--- a/lib/templates/html/top_level_property.html
+++ b/lib/templates/html/top_level_property.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{{sidebarForLibrary}}}
-  </div><!--/.sidebar-offcanvas-left-->
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-top-level-property">{{{name}}}</span> {{kind}} {{>feature_set}} {{>categorization}}</h1></div>
@@ -30,6 +24,12 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
     {{/self}}
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{{sidebarForLibrary}}}
+  </div><!--/.sidebar-offcanvas-left-->
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div><!--/.sidebar-offcanvas-->
 
diff --git a/lib/templates/html/typedef.html b/lib/templates/html/typedef.html
index 37cc5de239..5f8b8abe78 100644
--- a/lib/templates/html/typedef.html
+++ b/lib/templates/html/typedef.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{{sidebarForLibrary}}}
-  </div><!--/.sidebar-offcanvas-left-->
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-typedef">{{{nameWithGenerics}}}</span> {{kind}} {{>feature_set}} {{>categorization}}</h1></div>
@@ -24,6 +18,12 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
 
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{{sidebarForLibrary}}}
+  </div><!--/.sidebar-offcanvas-left-->
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div><!--/.sidebar-offcanvas-->
 

From 3b6bac466f8ead9e953c94f057382d0f59f485bd Mon Sep 17 00:00:00 2001
From: CaptainIRS <36656347+CaptainIRS@users.noreply.github.com>
Date: Thu, 22 Apr 2021 14:23:53 +0530
Subject: [PATCH 2/3] Change flex order to bring sidebar to left visually

---
 lib/resources/styles.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/resources/styles.css b/lib/resources/styles.css
index 1c64702255..ece7755808 100644
--- a/lib/resources/styles.css
+++ b/lib/resources/styles.css
@@ -77,6 +77,7 @@ main {
 
 .sidebar-offcanvas-left {
   flex: 0 1 230px;
+  order: 1;
   overflow-y: scroll;
   padding: 20px 0 15px 30px;
   margin: 5px 20px 0 0;
@@ -93,6 +94,7 @@ main {
 
 .main-content {
   flex: 1;
+  order: 2;
   overflow-y: scroll;
   padding: 10px 20px 0 20px;
   visibility: hidden; /* shown by Javascript after scroll position restore */
@@ -100,6 +102,7 @@ main {
 
 .sidebar-offcanvas-right {
   flex: 0 1 12em;
+  order: 3;
   overflow-y: scroll;
   padding: 20px 15px 15px 15px;
   margin-top: 5px;

From d280cfd1ff46219617490aa4409ad79cb7eda05f Mon Sep 17 00:00:00 2001
From: CaptainIRS <36656347+CaptainIRS@users.noreply.github.com>
Date: Thu, 22 Apr 2021 15:12:28 +0530
Subject: [PATCH 3/3] Update test package files to reflect the changes

---
 .../templates/404error.html                         | 12 ++++++------
 .../templates/category.html                         | 13 +++++++------
 .../templates/class.html                            | 12 ++++++------
 .../templates/constant.html                         | 12 ++++++------
 .../templates/constructor.html                      | 12 ++++++------
 .../templates/enum.html                             | 12 ++++++------
 .../templates/extension.html                        | 12 ++++++------
 .../templates/function.html                         | 12 ++++++------
 .../templates/index.html                            | 11 ++++++-----
 .../templates/library.html                          | 12 ++++++------
 .../templates/method.html                           | 12 ++++++------
 .../templates/mixin.html                            | 12 ++++++------
 .../templates/property.html                         | 12 ++++++------
 .../templates/top_level_constant.html               | 12 ++++++------
 .../templates/top_level_property.html               | 12 ++++++------
 .../templates/typedef.html                          | 12 ++++++------
 16 files changed, 97 insertions(+), 95 deletions(-)

diff --git a/testing/test_package_custom_templates/templates/404error.html b/testing/test_package_custom_templates/templates/404error.html
index 06ea358d13..2226bf8f8f 100644
--- a/testing/test_package_custom_templates/templates/404error.html
+++ b/testing/test_package_custom_templates/templates/404error.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5><span class="package-name">{{self.name}}</span> <span class="package-kind">{{self.kind}}</span></h5>
-    {{>packages}}
-  </div>
-
   <div id="dartdoc-main-content" class="main-content">
     <h1>404: Something's gone wrong :-(</h1>
 
@@ -21,6 +15,12 @@ <h1>404: Something's gone wrong :-(</h1>
     </section>
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5><span class="package-name">{{self.name}}</span> <span class="package-kind">{{self.kind}}</span></h5>
+    {{>packages}}
+  </div>
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div>
 
diff --git a/testing/test_package_custom_templates/templates/category.html b/testing/test_package_custom_templates/templates/category.html
index 9a371f442d..410a4719c8 100644
--- a/testing/test_package_custom_templates/templates/category.html
+++ b/testing/test_package_custom_templates/templates/category.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5><span class="package-name">{{parent.name}}</span> <span class="package-kind">{{parent.kind}}</span></h5>
-    {{>packages}}
-  </div>
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <h1><span class="kind-category">{{name}}</span> {{kind}}</h1>
@@ -121,6 +115,13 @@ <h2>Exceptions / Errors</h2>
     {{/self}}
 
   </div> <!-- /.main-content -->
+
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5><span class="package-name">{{parent.name}}</span> <span class="package-kind">{{parent.kind}}</span></h5>
+    {{>packages}}
+  </div>
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
     <h5>{{self.name}} {{self.kind}}</h5>
     {{>sidebar_for_category}}
diff --git a/testing/test_package_custom_templates/templates/class.html b/testing/test_package_custom_templates/templates/class.html
index bcfd67fcea..9999bbce1a 100644
--- a/testing/test_package_custom_templates/templates/class.html
+++ b/testing/test_package_custom_templates/templates/class.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{>sidebar_for_library}}
-  </div>
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-class">{{{nameWithGenerics}}}</span> {{kind}} {{>categorization}}</h1></div>
@@ -173,6 +167,12 @@ <h2>Constants</h2>
 
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{>sidebar_for_library}}
+  </div>
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
     {{>sidebar_for_class}}
   </div><!--/.sidebar-offcanvas-->
diff --git a/testing/test_package_custom_templates/templates/constant.html b/testing/test_package_custom_templates/templates/constant.html
index 0577cba6d5..40f023d70c 100644
--- a/testing/test_package_custom_templates/templates/constant.html
+++ b/testing/test_package_custom_templates/templates/constant.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{>sidebar_for_container}}
-  </div><!--/.sidebar-offcanvas-left-->
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-constant">{{{name}}}</span> {{kind}}</h1></div>
@@ -27,6 +21,12 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
 
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{>sidebar_for_container}}
+  </div><!--/.sidebar-offcanvas-left-->
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div><!--/.sidebar-offcanvas-->
 
diff --git a/testing/test_package_custom_templates/templates/constructor.html b/testing/test_package_custom_templates/templates/constructor.html
index 297273230d..3cca91109d 100644
--- a/testing/test_package_custom_templates/templates/constructor.html
+++ b/testing/test_package_custom_templates/templates/constructor.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{>sidebar_for_class}}
-  </div><!--/.sidebar-offcanvas-left-->
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-constructor">{{{nameWithGenerics}}}</span> {{kind}}</h1></div>
@@ -33,6 +27,12 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
     {{/constructor}}
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{>sidebar_for_class}}
+  </div><!--/.sidebar-offcanvas-left-->
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div><!--/.sidebar-offcanvas-->
 
diff --git a/testing/test_package_custom_templates/templates/enum.html b/testing/test_package_custom_templates/templates/enum.html
index a5828bfb42..8816a4e784 100644
--- a/testing/test_package_custom_templates/templates/enum.html
+++ b/testing/test_package_custom_templates/templates/enum.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{>sidebar_for_library}}
-  </div>
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-enum">{{{name}}}</span> {{kind}} {{>categorization}}</h1></div>
@@ -163,6 +157,12 @@ <h2>Static Methods</h2>
     {{/eNum}}
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{>sidebar_for_library}}
+  </div>
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
     {{>sidebar_for_enum}}
   </div><!--/.sidebar-offcanvas-->
diff --git a/testing/test_package_custom_templates/templates/extension.html b/testing/test_package_custom_templates/templates/extension.html
index 15b52351dc..803f46c354 100644
--- a/testing/test_package_custom_templates/templates/extension.html
+++ b/testing/test_package_custom_templates/templates/extension.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-<div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{>sidebar_for_library}}
-</div>
-
 <div id="dartdoc-main-content" class="main-content">
     {{#self}}
     <div>{{>source_link}}<h1><span class="kind-class">{{{nameWithGenerics}}}</span> {{kind}} {{>categorization}}</h1></div>
@@ -98,6 +92,12 @@ <h2>Constants</h2>
 
 </div> <!-- /.main-content -->
 
+<div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{>sidebar_for_library}}
+</div>
+
 <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
     {{>sidebar_for_extension}}
 </div><!--/.sidebar-offcanvas-->
diff --git a/testing/test_package_custom_templates/templates/function.html b/testing/test_package_custom_templates/templates/function.html
index d074bffc4a..956331f77d 100644
--- a/testing/test_package_custom_templates/templates/function.html
+++ b/testing/test_package_custom_templates/templates/function.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{>sidebar_for_library}}
-  </div><!--/.sidebar-offcanvas-left-->
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-function">{{{nameWithGenerics}}}</span> {{kind}} {{>categorization}}</h1></div>
@@ -22,6 +16,12 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
     {{/function}}
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{>sidebar_for_library}}
+  </div><!--/.sidebar-offcanvas-left-->
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div><!--/.sidebar-offcanvas-->
 
diff --git a/testing/test_package_custom_templates/templates/index.html b/testing/test_package_custom_templates/templates/index.html
index 0d96d10931..188c8cc915 100644
--- a/testing/test_package_custom_templates/templates/index.html
+++ b/testing/test_package_custom_templates/templates/index.html
@@ -1,10 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5 class="hidden-xs"><span class="package-name">{{self.name}}</span> <span class="package-kind">{{self.kind}}</span></h5>
-    {{>packages}}
-  </div>
 
 Welcome my friends to a custom template
 
@@ -38,6 +33,12 @@ <h3>{{name}}</h3>
 
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5 class="hidden-xs"><span class="package-name">{{self.name}}</span> <span class="package-kind">{{self.kind}}</span></h5>
+    {{>packages}}
+  </div>
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div>
 
diff --git a/testing/test_package_custom_templates/templates/library.html b/testing/test_package_custom_templates/templates/library.html
index b15d49541b..6f5315009c 100644
--- a/testing/test_package_custom_templates/templates/library.html
+++ b/testing/test_package_custom_templates/templates/library.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5><span class="package-name">{{parent.name}}</span> <span class="package-kind">{{parent.kind}}</span></h5>
-    {{>packages}}
-  </div>
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-library">{{{name}}}</span> {{kind}} {{>categorization}}</h1></div>
@@ -125,6 +119,12 @@ <h2>Exceptions / Errors</h2>
 
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5><span class="package-name">{{parent.name}}</span> <span class="package-kind">{{parent.kind}}</span></h5>
+    {{>packages}}
+  </div>
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
     <h5>{{self.name}} {{self.kind}}</h5>
     {{>sidebar_for_library}}
diff --git a/testing/test_package_custom_templates/templates/method.html b/testing/test_package_custom_templates/templates/method.html
index 5cc14840b4..f0f2cbfc13 100644
--- a/testing/test_package_custom_templates/templates/method.html
+++ b/testing/test_package_custom_templates/templates/method.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{>sidebar_for_container}}
-  </div><!--/.sidebar-offcanvas-->
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-method">{{{nameWithGenerics}}}</span> {{kind}}</h1></div>
@@ -23,6 +17,12 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
     {{/method}}
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{>sidebar_for_container}}
+  </div><!--/.sidebar-offcanvas-->
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div><!--/.sidebar-offcanvas-->
 
diff --git a/testing/test_package_custom_templates/templates/mixin.html b/testing/test_package_custom_templates/templates/mixin.html
index c35989966d..afe47576d5 100644
--- a/testing/test_package_custom_templates/templates/mixin.html
+++ b/testing/test_package_custom_templates/templates/mixin.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{>sidebar_for_library}}
-  </div>
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-mixin">{{{nameWithGenerics}}}</span> {{kind}} {{>categorization}}</h1></div>
@@ -172,6 +166,12 @@ <h2>Constants</h2>
     {{/mixin}}
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{>sidebar_for_library}}
+  </div>
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
     {{>sidebar_for_class}}
   </div><!--/.sidebar-offcanvas-->
diff --git a/testing/test_package_custom_templates/templates/property.html b/testing/test_package_custom_templates/templates/property.html
index 691da45f25..bcc6312b09 100644
--- a/testing/test_package_custom_templates/templates/property.html
+++ b/testing/test_package_custom_templates/templates/property.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{>sidebar_for_container}}
-  </div><!--/.sidebar-offcanvas-->
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-property">{{name}}</span> {{kind}}</h1></div>
@@ -34,6 +28,12 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
     {{/self}}
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{>sidebar_for_container}}
+  </div><!--/.sidebar-offcanvas-->
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div><!--/.sidebar-offcanvas-->
 
diff --git a/testing/test_package_custom_templates/templates/top_level_constant.html b/testing/test_package_custom_templates/templates/top_level_constant.html
index 249c137579..68b351843a 100644
--- a/testing/test_package_custom_templates/templates/top_level_constant.html
+++ b/testing/test_package_custom_templates/templates/top_level_constant.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{>sidebar_for_library}}
-  </div><!--/.sidebar-offcanvas-left-->
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-top-level-constant">{{{name}}}</span> {{kind}} {{>categorization}}</h1></div>
@@ -22,6 +16,12 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
 
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{>sidebar_for_library}}
+  </div><!--/.sidebar-offcanvas-left-->
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div><!--/.sidebar-offcanvas-->
 
diff --git a/testing/test_package_custom_templates/templates/top_level_property.html b/testing/test_package_custom_templates/templates/top_level_property.html
index 8b587177da..f91bfb460c 100644
--- a/testing/test_package_custom_templates/templates/top_level_property.html
+++ b/testing/test_package_custom_templates/templates/top_level_property.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{>sidebar_for_library}}
-  </div><!--/.sidebar-offcanvas-left-->
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-top-level-property">{{{name}}}</span> {{kind}} {{>categorization}}</h1></div>
@@ -30,6 +24,12 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
     {{/self}}
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{>sidebar_for_library}}
+  </div><!--/.sidebar-offcanvas-left-->
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div><!--/.sidebar-offcanvas-->
 
diff --git a/testing/test_package_custom_templates/templates/typedef.html b/testing/test_package_custom_templates/templates/typedef.html
index 5145d31133..a434ff0ac1 100644
--- a/testing/test_package_custom_templates/templates/typedef.html
+++ b/testing/test_package_custom_templates/templates/typedef.html
@@ -1,11 +1,5 @@
 {{>head}}
 
-  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{>sidebar_for_library}}
-  </div><!--/.sidebar-offcanvas-left-->
-
   <div id="dartdoc-main-content" class="main-content">
     {{#self}}
       <div>{{>source_link}}<h1><span class="kind-typedef">{{{nameWithGenerics}}}</span> {{kind}} {{>categorization}}</h1></div>
@@ -26,6 +20,12 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
 
   </div> <!-- /.main-content -->
 
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    {{>search_sidebar}}
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{>sidebar_for_library}}
+  </div><!--/.sidebar-offcanvas-left-->
+
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div><!--/.sidebar-offcanvas-->