From d2883f3c274b7cd3e4ab2c2b0683e22f939c2547 Mon Sep 17 00:00:00 2001
From: Santos Gallegos <santos_g@outlook.com>
Date: Fri, 22 Dec 2017 23:35:55 -0500
Subject: [PATCH 1/3] Wrap versions' list to look more consistent

---
 .../projects/project_version_list.html        | 147 ++++++++++--------
 1 file changed, 79 insertions(+), 68 deletions(-)

diff --git a/readthedocs/templates/projects/project_version_list.html b/readthedocs/templates/projects/project_version_list.html
index 0b4b6b32b91..d91d4fc918c 100644
--- a/readthedocs/templates/projects/project_version_list.html
+++ b/readthedocs/templates/projects/project_version_list.html
@@ -21,45 +21,52 @@
 
     <div class="module project-versions-active">
       <div class="module-wrapper">
-        <h1>{% trans "Active Versions" %}</h1>
-        <div class="module-list-wrapper">
-          <ul>
-            {% for version in active_versions|sort_version_aware %}
-              {% block active-versions %}
-              <li class="module-item">
-                {# Link to the docs #}
-                <a class="module-item-title" href="{{ version.get_absolute_url }}">{{ version.slug }}</a>
-
-                {% if request.user|is_admin:project %}
-                  <span class="right-menu">
-                    {{ version.get_privacy_level_display }}
-                  </span>
-                {% endif %}
-
-                {% if not version.slug in version.identifier %}
-                  <span class="right-menu quiet version-branch">{{ version.identifier_friendly|truncatechars:24 }}</span>
-                {% endif %}
-
-                {% if request.user|is_admin:project %}
-                  <ul class="module-item-menu">
-                    <li><a href="{% url "project_version_detail" project.slug version.slug %}">{% trans "Edit" %}</a></li>
-                  </ul>
-                {% else %}
-                  <ul class="module-item-menu">
-                    <li><a href="{{ version.get_absolute_url }}">{% trans "View Docs" %}</a></li>
-                  </ul>
-                {% endif %}
-
-              </li>
-              {% endblock active-versions %}
-
-            {% empty %}
-            <p>
-            {% trans "No active versions." %}
-            </p>
-            {% endfor %}
-          </ul>
+
+        <div class="module-header">
+          <h1>{% trans "Active Versions" %}</h1>
         </div>
+
+        <div class="module-list">
+          <div class="module-list-wrapper">
+            <ul>
+              {% for version in active_versions|sort_version_aware %}
+                {% block active-versions %}
+                  <li class="module-item">
+                    {# Link to the docs #}
+                    <a class="module-item-title" href="{{ version.get_absolute_url }}">{{ version.slug }}</a>
+
+                    {% if request.user|is_admin:project %}
+                      <span class="right-menu">
+                        {{ version.get_privacy_level_display }}
+                      </span>
+                    {% endif %}
+
+                    {% if not version.slug in version.identifier %}
+                      <span class="right-menu quiet version-branch">{{ version.identifier_friendly|truncatechars:24 }}</span>
+                    {% endif %}
+
+                    {% if request.user|is_admin:project %}
+                      <ul class="module-item-menu">
+                        <li><a href="{% url "project_version_detail" project.slug version.slug %}">{% trans "Edit" %}</a></li>
+                      </ul>
+                    {% else %}
+                      <ul class="module-item-menu">
+                        <li><a href="{{ version.get_absolute_url }}">{% trans "View Docs" %}</a></li>
+                      </ul>
+                    {% endif %}
+
+                  </li>
+                {% endblock active-versions %}
+
+              {% empty %}
+                <p>
+                  {% trans "No active versions." %}
+                </p>
+              {% endfor %}
+            </ul>
+          </div>
+        </div>
+
       </div>
     </div>
 
@@ -68,42 +75,46 @@ <h1>{% trans "Active Versions" %}</h1>
       <div class="module-wrapper">
 
         {% if inactive_versions %}
-          <h1>{% trans "Inactive Versions" %}</h1>
-          <div class="module-list-wrapper">
-            <ul>
-              {% for version in inactive_versions|sort_version_aware %}
+          <div class="module-header">
+            <h1>{% trans "Inactive Versions" %}</h1>
+          </div>
 
-              {% block inactive-versions %}
-                <li class="module-item">
-                  {# Link to the docs #}
-                  <span class="quiet">{{ version.slug }}</span>
+          <div class="module-list">
+            <div class="module-list-wrapper">
+              <ul>
+                {% for version in inactive_versions|sort_version_aware %}
 
+                  {% block inactive-versions %}
+                    <li class="module-item">
+                      {# Link to the docs #}
+                      <span class="quiet">{{ version.slug }}</span>
 
-                  {% if request.user|is_admin:project %}
-                    <span class="right-menu">
-                      {{ version.get_privacy_level_display }}
-                    </span>
-                  {% endif %}
 
-                  {% if not version.slug in version.identifier_friendly %}
-                    <span class="right-menu quiet version-branch">{{ version.identifier_friendly|truncatechars:24 }}</span>
-                  {% endif %}
+                      {% if request.user|is_admin:project %}
+                        <span class="right-menu">
+                          {{ version.get_privacy_level_display }}
+                        </span>
+                      {% endif %}
 
-                  {% if request.user|is_admin:project %}
-                    <ul class="module-item-menu">
-                      {% if version.built %}
-                          <li><a href="{% url "project_version_delete_html" project.slug version.slug %}">{% trans "Clean" %}</a></li>
+                      {% if not version.slug in version.identifier_friendly %}
+                        <span class="right-menu quiet version-branch">{{ version.identifier_friendly|truncatechars:24 }}</span>
                       {% endif %}
-                      <li><a href="{% url "project_version_detail" project.slug version.slug %}">{% trans "Edit" %}</a></li>
-                    </ul>
-                  {% endif %}
-
-                  
-                </li>
-              {% endblock inactive-versions %}
-              
-              {% endfor %}
-            </ul>
+
+                      {% if request.user|is_admin:project %}
+                        <ul class="module-item-menu">
+                          {% if version.built %}
+                            <li><a href="{% url "project_version_delete_html" project.slug version.slug %}">{% trans "Clean" %}</a></li>
+                          {% endif %}
+                          <li><a href="{% url "project_version_detail" project.slug version.slug %}">{% trans "Edit" %}</a></li>
+                        </ul>
+                      {% endif %}
+
+                    </li>
+                  {% endblock inactive-versions %}
+                
+                {% endfor %}
+              </ul>
+            </div>
           </div>
         {% endif %}
 

From 3f3d6b583e2b1a69b3f76a41038b0da3dcbbcf99 Mon Sep 17 00:00:00 2001
From: Santos Gallegos <santos_g@outlook.com>
Date: Fri, 16 Feb 2018 12:13:38 -0500
Subject: [PATCH 2/3] Consistent empty state for lists

---
 readthedocs/templates/core/project_details.html          | 8 +++++---
 readthedocs/templates/core/project_downloads.html        | 6 ++++--
 readthedocs/templates/projects/project_version_list.html | 8 +++++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/readthedocs/templates/core/project_details.html b/readthedocs/templates/core/project_details.html
index c38253d06aa..ad23437c7d7 100644
--- a/readthedocs/templates/core/project_details.html
+++ b/readthedocs/templates/core/project_details.html
@@ -46,9 +46,11 @@ <h3>{% trans "Versions" %}</h3>
         </li>
 
       {% empty %}
-      <p>
-      {% trans "No active versions." %}
-      </p>
+        <li class="module-item">
+          <p class="quiet">
+            {% trans "No active versions." %}
+          </p>
+        </li>
       {% endfor %}
       </ul>
     </div>
diff --git a/readthedocs/templates/core/project_downloads.html b/readthedocs/templates/core/project_downloads.html
index 7c850e05a28..4bfff7a7330 100644
--- a/readthedocs/templates/core/project_downloads.html
+++ b/readthedocs/templates/core/project_downloads.html
@@ -26,7 +26,9 @@
   {% endif %}
 
 {% empty %}
-    <p>
-    {% trans "No downloads for this project." %}
+  <li class="module-item">
+    <p class="quiet">
+      {% trans "No downloads for this project." %}
     </p>
+  </li>
 {% endfor %}
diff --git a/readthedocs/templates/projects/project_version_list.html b/readthedocs/templates/projects/project_version_list.html
index d91d4fc918c..c74595ef0f5 100644
--- a/readthedocs/templates/projects/project_version_list.html
+++ b/readthedocs/templates/projects/project_version_list.html
@@ -59,9 +59,11 @@ <h1>{% trans "Active Versions" %}</h1>
                 {% endblock active-versions %}
 
               {% empty %}
-                <p>
-                  {% trans "No active versions." %}
-                </p>
+                <li class="module-item">
+                  <p class="quiet">
+                    {% trans "No active versions." %}
+                  </p>
+                </li>
               {% endfor %}
             </ul>
           </div>

From 7b7ecb3bfc6fa37f56dc7eace19f8ce09f8233f4 Mon Sep 17 00:00:00 2001
From: Santos Gallegos <santos_g@outlook.com>
Date: Fri, 16 Feb 2018 12:14:00 -0500
Subject: [PATCH 3/3] Wrap integration list

---
 readthedocs/templates/projects/integration_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readthedocs/templates/projects/integration_list.html b/readthedocs/templates/projects/integration_list.html
index 099538fdb55..089044b50a7 100644
--- a/readthedocs/templates/projects/integration_list.html
+++ b/readthedocs/templates/projects/integration_list.html
@@ -23,7 +23,7 @@
     </ul>
   </div>
 
-  <div class="module">
+  <div class="module-list">
     <div class="module-list-wrapper">
       <ul>
         {% for integration in object_list %}