From 5aef2d674a4d02cccf5c495926d3dbc86f392155 Mon Sep 17 00:00:00 2001
From: ingerjm0 <jenna@highfidelity.io>
Date: Thu, 5 Sep 2019 10:12:59 -0700
Subject: [PATCH 1/9] DOC-69: Move Supported Script Types section to top of
 JSDoc pages

---
 tools/jsdoc/plugins/hifi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/jsdoc/plugins/hifi.js b/tools/jsdoc/plugins/hifi.js
index 67dafe5a16..07549530ce 100644
--- a/tools/jsdoc/plugins/hifi.js
+++ b/tools/jsdoc/plugins/hifi.js
@@ -125,7 +125,7 @@ exports.handlers = {
             if (rows.length > 0) {
                 var availableIn = "<p class='availableIn'><b>Supported Script Types:</b> " + rows.join(" &bull; ") + "</p>";
              
-                e.doclet.description = (e.doclet.description ? e.doclet.description : "") + availableIn;
+                e.doclet.description = availableIn + (e.doclet.description ? e.doclet.description : "");
             }            
         }
 

From 5ebf141d7374e77dbfb5cb297ecfa7da111ee127 Mon Sep 17 00:00:00 2001
From: ingerjm0 <jenna@highfidelity.io>
Date: Thu, 5 Sep 2019 10:39:18 -0700
Subject: [PATCH 2/9] DOC-67: Incorrect location of example code for Avatar API

---
 .../hifi-jsdoc-template/tmpl/container.tmpl   | 32 ++++++++-----------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl b/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
index 2a5e863d6d..7dabba0809 100644
--- a/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
+++ b/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
@@ -92,35 +92,29 @@
                         </tr>
                     </tbody>
                 </table>
-
-                <?js= self.partial('details.tmpl', doc) ?>
-
-                <?js if (doc.examples && doc.examples.length) { ?>
-                    <h3>Example<?js= doc.examples.length > 1? 's':'' ?></h3>
-                    <?js= self.partial('examples.tmpl', doc.examples) ?>
-                <?js } ?>
+                 <?js= self.partial('details.tmpl', doc) ?>
 
             <?js } else { ?>
                 <h3>Description</h3>
                 <?js if (doc.description) { ?>
                     <p><?js= doc.description ?></p>
                 <?js } ?>
-            <?js
-                var classes = self.find({kind: 'class', memberof: doc.longname});
-                if (!isGlobalPage && classes && classes.length) {
-            ?>
-                <h3 id="#class">Classes</h3>
-                <?js classes.forEach(function(c) { ?>
-                    <p><?js= self.linkto(c.longname, c.name) ?></p>
-                <?js }); ?>
-            <?js } ?>
-
-                <?js= self.partial('details.tmpl', doc) ?>
 
                 <?js if (doc.examples && doc.examples.length) { ?>
                     <h3>Example<?js= doc.examples.length > 1? 's':'' ?></h3>
                     <?js= self.partial('examples.tmpl', doc.examples) ?>
                 <?js } ?>
+                <?js
+                    var classes = self.find({kind: 'class', memberof: doc.longname});
+                    if (!isGlobalPage && classes && classes.length) {
+                ?>
+                    <h3 id="#class">Classes</h3>
+                    <?js classes.forEach(function(c) { ?>
+                        <p><?js= self.linkto(c.longname, c.name) ?></p>
+                        <?js }); ?>
+                    <?js } ?>
+
+                    <?js= self.partial('details.tmpl', doc) ?>
             <?js } ?>
         </div>
 
@@ -245,7 +239,7 @@
             <?js typedefs.forEach(function(e) {
                     if (e.signature) {
                 ?>
-                    <?js= self.partial('method.tmpl', e) ?>
+                    <?js= self.partial('members.tmpl', e) ?>
                 <?js
                     }
                     else {

From 9bf579d8781a947779e88e9d3d38141eca1c1bc5 Mon Sep 17 00:00:00 2001
From: ingerjm0 <jenna@highfidelity.io>
Date: Thu, 5 Sep 2019 11:08:25 -0700
Subject: [PATCH 3/9] DOC-156: Fix font size issues on non-paragraph text

---
 tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css b/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
index a33cff15e4..fabdfa35d0 100644
--- a/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
+++ b/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
@@ -38,6 +38,7 @@ body
 	font-weight: 400; 
     color: #000000;
     letter-spacing: 0.5px;  
+    font-size: 0.95rem;
 }
 
 p {

From af7e68786a5ad8583fcdba81e01e7faa4968fcee Mon Sep 17 00:00:00 2001
From: ingerjm0 <jenna@highfidelity.io>
Date: Thu, 5 Sep 2019 11:29:13 -0700
Subject: [PATCH 4/9] DOC-156 (comment): Fixed spacing on non-paragraph text

---
 tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css b/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
index fabdfa35d0..391f1c6da4 100644
--- a/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
+++ b/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
@@ -23,7 +23,7 @@
 ********************************************************************/
 
 * {
-  box-sizing: border-box
+  box-sizing: border-box;
 }
 
 html
@@ -39,6 +39,7 @@ body
     color: #000000;
     letter-spacing: 0.5px;  
     font-size: 0.95rem;
+    line-height: 20px;    
 }
 
 p {
@@ -423,7 +424,6 @@ header {
     display: block;
     text-align: center;
     font-size: 90%;
-    margin-top: -20px;
 }
 
 .variation {

From d8c655a151d1fb07a54a776f6205cd320838fe8c Mon Sep 17 00:00:00 2001
From: ingerjm0 <jenna@highfidelity.io>
Date: Thu, 5 Sep 2019 11:42:34 -0700
Subject: [PATCH 5/9] Fixed spacing issues in navigation caused by fix to to
 DOC-156

---
 tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css b/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
index 391f1c6da4..c8deaf4b6d 100644
--- a/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
+++ b/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
@@ -44,7 +44,6 @@ body
 
 p {
     font-size: 0.95rem;
-    line-height: 20px;
 }
 
 section
@@ -201,6 +200,7 @@ nav {
     padding-left: 20px;
     padding-right: 20px;
     box-sizing: border-box;
+    line-height: 12px;
 }
 
 nav::-webkit-scrollbar {

From b8b7dbf6819f5e4a2d9c17abc46b94c08242743d Mon Sep 17 00:00:00 2001
From: ingerjm0 <jenna@highfidelity.io>
Date: Thu, 5 Sep 2019 13:39:06 -0700
Subject: [PATCH 6/9] DOC-148: Increase size of monospace type

---
 tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css b/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
index c8deaf4b6d..2386f88586 100644
--- a/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
+++ b/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
@@ -129,7 +129,6 @@ table {
 thead {
     border-color: #d8e1d9;
     background:#d8e1d9;
-    text-align: left;    
 }
 
 table tr {
@@ -147,6 +146,7 @@ td {
 article table thead tr th, article table tbody tr td, article table tbody tr td p {
     font-size: .89rem;
     line-height: 20px;
+    text-align: left;
 }
 
 article table thead tr th, article table tbody tr td {
@@ -380,12 +380,12 @@ nav > h2 > a {
 
 tt, code, kbd, samp {
     font-family: Consolas, Monaco, 'Andale Mono', monospace;
-    font-size: 0.9rem;
+    font-size: 1.05em;
 }
 
 .name, .signature {
   font-family: Consolas, Monaco, 'Andale Mono', monospace;
-  font-size: 0.9rem;
+  font-size: 1.05em;
 }
 
 img {
@@ -538,7 +538,7 @@ header {
 
 .prettyprint code
 {
-    font-size: 0.7rem;
+    font-size: 0.9em;
     line-height: 18px;
     display: block;
     padding: 4px 12px;

From 55bdc7d2a61db8f9fdc24beb6b2b4c46cdd2ce3a Mon Sep 17 00:00:00 2001
From: ingerjm0 <jenna@highfidelity.io>
Date: Thu, 5 Sep 2019 13:54:55 -0700
Subject: [PATCH 7/9] Made sure ctrlaltdavid's changes made it into my repo

---
 tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl b/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
index 7dabba0809..f9c6c42924 100644
--- a/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
+++ b/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
@@ -94,6 +94,10 @@
                 </table>
                  <?js= self.partial('details.tmpl', doc) ?>
 
+                <?js if (doc.examples && doc.examples.length) { ?>
+                    <h3>Example<?js= doc.examples.length > 1? 's':'' ?></h3>
+                    <?js= self.partial('examples.tmpl', doc.examples) ?>
+                <?js } ?>                
             <?js } else { ?>
                 <h3>Description</h3>
                 <?js if (doc.description) { ?>
@@ -184,7 +188,7 @@
             <h3 class="subsection-title">Members</h3>
 
             <?js members.forEach(function(p) { ?>
-                <?js= self.partial('members.tmpl', p) ?>
+                <?js= self.partial('method.tmpl', p) ?>
             <?js }); ?>
         <?js } ?>
 

From 2322a9ea7f42e264f54af732685eed8b784a7f26 Mon Sep 17 00:00:00 2001
From: ingerjm0 <jenna@highfidelity.io>
Date: Thu, 5 Sep 2019 13:58:59 -0700
Subject: [PATCH 8/9] Making sure ctrlaltdavid's changes made it into my
 repository

---
 tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl b/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
index f9c6c42924..acbab36d8d 100644
--- a/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
+++ b/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
@@ -188,7 +188,7 @@
             <h3 class="subsection-title">Members</h3>
 
             <?js members.forEach(function(p) { ?>
-                <?js= self.partial('method.tmpl', p) ?>
+                <?js= self.partial('members.tmpl', p) ?>
             <?js }); ?>
         <?js } ?>
 
@@ -243,7 +243,7 @@
             <?js typedefs.forEach(function(e) {
                     if (e.signature) {
                 ?>
-                    <?js= self.partial('members.tmpl', e) ?>
+                    <?js= self.partial('method.tmpl', e) ?>
                 <?js
                     }
                     else {

From d548afb2771d0f83117cd96ae92454cc58a3efa2 Mon Sep 17 00:00:00 2001
From: jennaingersoll <42979611+jennaingersoll@users.noreply.github.com>
Date: Wed, 11 Sep 2019 17:06:35 -0700
Subject: [PATCH 9/9] Removed indent per review

---
 tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl b/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
index acbab36d8d..5c149fa434 100644
--- a/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
+++ b/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
@@ -92,7 +92,7 @@
                         </tr>
                     </tbody>
                 </table>
-                 <?js= self.partial('details.tmpl', doc) ?>
+                <?js= self.partial('details.tmpl', doc) ?>
 
                 <?js if (doc.examples && doc.examples.length) { ?>
                     <h3>Example<?js= doc.examples.length > 1? 's':'' ?></h3>