From 3cbf5fa4f4bb840a655bd15316c18f4b9bc5db0b Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Fri, 6 Jun 2014 19:37:04 +0100
Subject: [PATCH] More style tweaks to the project page

---
 services/web/app/views/project/list.jade      | 87 ++++++++++---------
 .../public/stylesheets/app/project-list.less  |  3 +-
 2 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/services/web/app/views/project/list.jade b/services/web/app/views/project/list.jade
index 4911ed8978..3fd147bf25 100644
--- a/services/web/app/views/project/list.jade
+++ b/services/web/app/views/project/list.jade
@@ -54,23 +54,21 @@ block content
 								li
 									a#uploadNewProject(href="#", data-csrf=csrfToken) Upload Project
 								li.divider
-								li.dropdown-submenu
-									a(tabindex="-1", href="#", data-toggle="dropdown") Templates
-									ul.dropdown-menu
-										li
-											a.menu-indent(href="/templates/cv") CV or Resume
-										li
-											a.menu-indent(href="/templates/cover-letters") Cover Letter
-										li
-											a.menu-indent(href="/templates/journals") Journal Article
-										li
-											a.menu-indent(href="/templates/presentations") Presentation
-										li
-											a.menu-indent(href="/templates/thesis") Thesis
-										li
-											a.menu-indent(href="/templates/bibliographies") Bibliographies
-										li
-											a.menu-indent(href="/templates") View All »
+								li.dropdown-header Templates
+								li
+									a.menu-indent(href="/templates/cv") CV or Resume
+								li
+									a.menu-indent(href="/templates/cover-letters") Cover Letter
+								li
+									a.menu-indent(href="/templates/journals") Journal Article
+								li
+									a.menu-indent(href="/templates/presentations") Presentation
+								li
+									a.menu-indent(href="/templates/thesis") Thesis
+								li
+									a.menu-indent(href="/templates/bibliographies") Bibliographies
+								li
+									a.menu-indent(href="/templates") View All »
 					.row-spaced
 							ul.list-unstyled.folders-menu.js-folders-menu
 								li
@@ -117,34 +115,45 @@ block content
 										i.fa.fa-search.form-control-feedback
 									//- i.fa.fa-remove
 
-								.cold-md6
-									.project-tools.js-toggle-tools.hidden
-										.btn-toolbar
-											.btn-group
-												a(href='/project/'+"5369c5737fc6b47f048da1f5"+'/download/zip', data-toggle="tooltip", data-placement="bottom", title="", data-original-title="Download .zip File").btn.downloadZip
-													i.fa.fa-cloud-download
+								.project-tools.js-toggle-tools
+									.btn-toolbar
+										.btn-group
+											a.btn.btn-default(href='#', data-toggle="tooltip", data-placement="bottom", title="", data-original-title="Download")
+												i.fa.fa-cloud-download
+											a.btn.btn-default(href='#', data-toggle="tooltip", data-placement="bottom", title="", data-original-title="Delete")
+												i.fa.fa-trash-o
+
+										.btn-group
+											a.btn.btn-default.dropdown-toggle(href="#", data-toggle="dropdown")
+												i.fa.fa-folder-open-o
+												|  
+												span.caret
+											ul.dropdown-menu.dropdown-menu-right(role="menu")
+												li.dropdown-header Add to folder
+												li
+													a.menu-indent(href="#") PhD
+												li
+													a.menu-indent(href="#") Personal
+												li
+													a.menu-indent(href="#") Papers
+
+										.btn-group
+											a.btn.btn-default.dropdown-toggle(data-toggle="dropdown", href="#") More 
+												span.caret
+											ul.dropdown-menu.dropdown-menu-right(role="menu")
+												li
+													a(href='/project/'+"5369c5737fc6b47f048da1f5"+'/clone', data-csrf=csrfToken).cloneProject Make a Copy...
 												-if ("owner" == "owner")
-													a(href='/project/'+"5369c5737fc6b47f048da1f5", data-name="the project", data-id="5369c5737fc6b47f048da1f5", data-csrf=csrfToken, data-toggle="tooltip", data-placement="bottom", title="", data-original-title="Remove").btn.deleteProject
-														i.fa.fa-trash-o
-												a.btn.dropdown-toggle
-													i.fa.fa-folder-open-o
-											.btn-group.project-actions
-												a.btn.dropdown-toggle(data-toggle="dropdown", href="#") More
-													span.caret
-												ul.dropdown-menu.pull-right(role="menu")
 													li
-														a(href='/project/'+"5369c5737fc6b47f048da1f5"+'/clone', data-csrf=csrfToken).cloneProject Make a Copy...
-													-if ("owner" == "owner")
-														li
-															a(href='/project/'+"5369c5737fc6b47f048da1f5"+'/rename', data-name="the project", data-id="5369c5737fc6b47f048da1f5", data-csrf=csrfToken).renameProject Rename...
-													-else
-														li
-															a(href='/project/'+"5369c5737fc6b47f048da1f5"+'/leave', data-name="the project", data-id="5369c5737fc6b47f048da1f5", data-csrf=csrfToken).leaveProject Leave Project
+														a(href='/project/'+"5369c5737fc6b47f048da1f5"+'/rename', data-name="the project", data-id="5369c5737fc6b47f048da1f5", data-csrf=csrfToken).renameProject Rename...
+												-else
+													li
+														a(href='/project/'+"5369c5737fc6b47f048da1f5"+'/leave', data-name="the project", data-id="5369c5737fc6b47f048da1f5", data-csrf=csrfToken).leaveProject Leave Project
 						.row
 							.col-md-12
 								.card.card-thin
 									- if (projects.length > 0)
-										ul#projectList
+										ul.list-unstyled.project-list
 											li
 												label.checkbox.select-all
 													input(type="checkbox")
diff --git a/services/web/public/stylesheets/app/project-list.less b/services/web/public/stylesheets/app/project-list.less
index 981482198c..ab3a309167 100644
--- a/services/web/public/stylesheets/app/project-list.less
+++ b/services/web/public/stylesheets/app/project-list.less
@@ -14,6 +14,7 @@
 }
 
 ul.folders-menu {
+  margin: 0;
   font-weight: 700;
   a {
   	font-size: 0.8rem;
@@ -35,7 +36,7 @@ form.project-search {
 	}
 }
 
-#projectList {
+ul.project-list {
 	list-style-type: none;
 	height: 420px;
 	margin: 0;