diff --git a/app/views/project/list.jade b/app/views/project/list.jade
index 6d62cf84dce10c3cc4b4f52a9ffeab556df775e3..f04e765aa8044284fe277438b46f8ef29e066d33 100644
--- a/app/views/project/list.jade
+++ b/app/views/project/list.jade
@@ -28,8 +28,6 @@ block content
-each project in projects
- project_id = project._id.toString()
li.project_entry(id=project_id)
- label.checkbox.select-item
- input(type="checkbox")
span.title
a.projectName(href="/project/#{project._id}") #{project.name}
span.project-tags(data-project-id=project_id)
@@ -38,57 +36,33 @@ block content
span.owner
mixin formatOwnerText(project.accessLevel, project.publicAccesLevel)
span.last-modified.isoDate #{project.lastUpdated.toISOString()}
+ span
+ a()
+ i.icon-cog
.page-header.project-header
.container
.row-fluid
.span2
h1 Projects
- .span10
+ .span7
form.form-inline.search
- input#projectFilter(placeholder='Search projects…', autofocus='autofocus').span6.projectSearch.search-query
+ input#projectFilter(placeholder='Search projects…', autofocus='autofocus').span10.projectSearch.search-query
i.icon-search
- //- i.icon-remove
- .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.icon-cloud-download
- -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.icon-trash
- a.btn.addTagButton.dropdown-toggle(data-project-id="5369c5737fc6b47f048da1f5", data-toggle="dropdown", href="#", data-toggle="tooltip", data-placement="bottom", title="", data-original-title="Add To Folder...")
- i.icon-folder-open
- span.caret
- ul.dropdown-menu.pull-right(role="menu")
- li
- input(placeholder='Tag Name', name='tags', style="display: none;", data-project-id="project_id_needs_updating").tags-input
- .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
-
+ .span2
+ .btn-group#newProject
+ a.btn.btn-primary.dropdown-toggle(data-toggle="dropdown", href="#") New Project
+ span.caret
+ ul.dropdown-menu.pull-right(role="menu")
+ li
+ a.normalText#blankNewProject(href="#", data-csrf=csrfToken) Blank Project
+ li
+ a.normalText#newProjectExample(href="#", data-csrf=csrfToken) Example Project
+ li
+ a.normalText#uploadNewProject(href="#", data-csrf=csrfToken) Upload Zipped Project
.container
.row-fluid
.span2
- .btn-group#newProject
- a.btn.btn-primary.dropdown-toggle(data-toggle="dropdown", href="#") New Project
- span.caret
- ul.dropdown-menu.pull-right(role="menu")
- li
- a.normalText#blankNewProject(href="#", data-csrf=csrfToken) Blank Project
- li
- a.normalText#newProjectExample(href="#", data-csrf=csrfToken) Example Project
- li
- a.normalText#uploadNewProject(href="#", data-csrf=csrfToken) Upload Zipped Project
- br
ul.unstyled.menu
li Folders
li
@@ -137,8 +111,6 @@ block content
- if (projects.length > 0)
ul#projectList
li
- label.checkbox.select-all
- input(type="checkbox")
span.title TITLE
span.owner OWNER
span.last-modified LAST MODIFIED
diff --git a/public/bootstrap/less/buttons.less b/public/bootstrap/less/buttons.less
index d64d2ec14d7e88a0990410b8261e8bacdb7d18b2..75858d1ba92c809a1856e8ce41820b4c9e4dce88 100644
--- a/public/bootstrap/less/buttons.less
+++ b/public/bootstrap/less/buttons.less
@@ -7,7 +7,7 @@
// Core
.btn {
- .buttonBackground(#eed, #ddc);
+ .buttonBackground(#e4ebf1, #c0cad2);
text-shadow: 0 1px 1px white;
display: inline-block;
padding: (@baseLineHeight * .2) (@baseLineHeight * .6);
diff --git a/public/bootstrap/less/type.less b/public/bootstrap/less/type.less
index 86995897a66f7d2b2ccc0d33c6dc563bb53fb283..be0a9d8ab315fc5bc84b7fecc1f5c6143d186fae 100644
--- a/public/bootstrap/less/type.less
+++ b/public/bootstrap/less/type.less
@@ -104,9 +104,9 @@ input, button, a.btn, select, textarea, .menu, .dropdown-menu {
}
}
.project-header {
- background-color: lighten(@beige, 5%);
- border-top: 1px solid darken(@beige, 10%);
- border-bottom: 1px solid darken(@beige, 10%);
+ background-color: #f6f6f6;
+ border-top: 1px solid darken(#f6f6f6, 10%);
+ border-bottom: 1px solid darken(#f6f6f6, 10%);
margin-top: 0;
padding-top: @baseLineHeight;
h1 {
diff --git a/public/stylesheets/less/list.less b/public/stylesheets/less/list.less
index fda100410c96e56d8c466846a394b881a95c07df..57d27d43df60444955d3e0bd230c224976a626df 100644
--- a/public/stylesheets/less/list.less
+++ b/public/stylesheets/less/list.less
@@ -56,6 +56,7 @@
}
.projectName {
margin-right: @baseLineHeight;
+ color:@darkBlue;
}
}
.project_entry {
diff --git a/public/stylesheets/variables.less b/public/stylesheets/variables.less
index 0bec42dac30e8b97dd454c4dd92dac506952fff0..9dd1880205e5ac2298fed91d698dec182f42f987 100644
--- a/public/stylesheets/variables.less
+++ b/public/stylesheets/variables.less
@@ -10,16 +10,17 @@
@linkColorHover: #e24b3b;
// Grays
-@black: #000;
+@black: #5f5f5f;
+@gray: #2d4053;
@grayDarker: #2c280f;
-@grayDark: #393313;
-@gray: #5f5620;
+@grayDark: #5f5f5f; //black
@grayLight: #999;
@grayLighter: #dadfd0;
@white: #fff;
// Accent colors
@blue: #049cdb;
+@darkBlue: #2d4053;
@blueDark: #0064cd;
@green: #46a546;
@red: @linkColor;
@@ -27,7 +28,7 @@
@orange: #f89406;
@pink: #c3325f;
@purple: #7a43b6;
-@beige: #f4f1de;
+@beige: #e4ebf1;
// Typography
@baseFontSize: 1rem;