From 69696c3b60981c0d408414a84cd856dcba4f9e9e Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Wed, 11 Oct 2017 09:17:50 -0500
Subject: [PATCH 1/2] chore(docs): adds types column and null checks for
 description

---
 tools/dgeni/templates/method.template.html        | 2 ++
 tools/dgeni/templates/property-list.template.html | 1 +
 tools/dgeni/templates/property.template.html      | 4 +++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/dgeni/templates/method.template.html b/tools/dgeni/templates/method.template.html
index 50b43d1223e6..8848b3c879c4 100644
--- a/tools/dgeni/templates/method.template.html
+++ b/tools/dgeni/templates/method.template.html
@@ -9,11 +9,13 @@
       </th>
     </tr>
   </thead>
+  {%- if method.description -%}
   <tr class="docs-api-method-description-row">
     <td colspan="2" class="docs-api-method-description-cell">
       {$ method.description | marked | safe $}
     </td>
   </tr>
+  {%- endif -%}
 
   {%- if method.params.length -%}
   <thead>
diff --git a/tools/dgeni/templates/property-list.template.html b/tools/dgeni/templates/property-list.template.html
index 0a54b03a629d..95fea6906a42 100644
--- a/tools/dgeni/templates/property-list.template.html
+++ b/tools/dgeni/templates/property-list.template.html
@@ -3,6 +3,7 @@ <h5 class="docs-api-h5 docs-api-method-header">Properties</h5>
   <table class="docs-api-properties-table">
     <tr class="docs-api-properties-header-row">
       <th class="docs-api-properties-th">Name</th>
+      <th class="docs-api-property-type-th">Type</th>
       <th class="docs-api-properties-th">Description</th>
     </tr>
     {% for p in propertyList %}
diff --git a/tools/dgeni/templates/property.template.html b/tools/dgeni/templates/property.template.html
index fd539e9ea11a..4374d5d29fc0 100644
--- a/tools/dgeni/templates/property.template.html
+++ b/tools/dgeni/templates/property.template.html
@@ -25,7 +25,9 @@
     <p class="docs-api-property-name">
       {$ property.name $}
     </p>
-    <code class="docs-api-property-type">{$ property.type $}</code>
+  </td>
+  <td class="docs-api-property-type">
+    <code>{$ property.type $}</code>
   </td>
   <td class="docs-api-property-description">{$ property.description | marked | safe $}</td>
 </tr>

From cc295e10040d140dcdb42aa973198cda1cbf9900 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Mon, 16 Oct 2017 10:06:51 -0500
Subject: [PATCH 2/2] chore(nit): update per pr feedback

---
 tools/dgeni/templates/property-list.template.html | 1 -
 tools/dgeni/templates/property.template.html      | 8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/dgeni/templates/property-list.template.html b/tools/dgeni/templates/property-list.template.html
index 95fea6906a42..0a54b03a629d 100644
--- a/tools/dgeni/templates/property-list.template.html
+++ b/tools/dgeni/templates/property-list.template.html
@@ -3,7 +3,6 @@ <h5 class="docs-api-h5 docs-api-method-header">Properties</h5>
   <table class="docs-api-properties-table">
     <tr class="docs-api-properties-header-row">
       <th class="docs-api-properties-th">Name</th>
-      <th class="docs-api-property-type-th">Type</th>
       <th class="docs-api-properties-th">Description</th>
     </tr>
     {% for p in propertyList %}
diff --git a/tools/dgeni/templates/property.template.html b/tools/dgeni/templates/property.template.html
index 4374d5d29fc0..9244bb306423 100644
--- a/tools/dgeni/templates/property.template.html
+++ b/tools/dgeni/templates/property.template.html
@@ -26,8 +26,10 @@
       {$ property.name $}
     </p>
   </td>
-  <td class="docs-api-property-type">
-    <code>{$ property.type $}</code>
+  <td class="docs-api-property-description">
+    <div class="docs-api-property-type">
+      Type: <code>{$ property.type $}</code>
+    </div>
+    {$ property.description | marked | safe $}
   </td>
-  <td class="docs-api-property-description">{$ property.description | marked | safe $}</td>
 </tr>