Style folder list

This commit is contained in:
James Allen 2014-06-09 08:54:14 +01:00
parent 68aff781af
commit ead812eacc
6 changed files with 85 additions and 67 deletions

View file

@ -46,71 +46,71 @@ block content
.container
.row
.col-md-2
.row-spaced
#newProject.dropdown
a.btn.btn-primary.dropdown-toggle(data-toggle="dropdown", href="#") New Project
ul.dropdown-menu(role="menu")
li
a#blankNewProject(href="#", data-csrf=csrfToken) Blank Project
li
a#newProjectExample(href="#", data-csrf=csrfToken) Example Project
li
a#uploadNewProject(href="#", data-csrf=csrfToken) Upload Project
li.divider
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 »
#newProject.dropdown
a.btn.btn-primary.dropdown-toggle(data-toggle="dropdown", href="#") New Project
ul.dropdown-menu(role="menu")
li
a#blankNewProject(href="#", data-csrf=csrfToken) Blank Project
li
a#newProjectExample(href="#", data-csrf=csrfToken) Example Project
li
a#uploadNewProject(href="#", data-csrf=csrfToken) Upload Project
li.divider
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
a.normalText.menu-indent(href="#") All projects
a.menu-indent(href="#") All projects
li
a.normalText.menu-indent(href="#") Your projects
a.menu-indent(href="#") Your projects
li
a.normalText.menu-indent(href="#") Shared with you
li Folders
a.menu-indent(href="#") Shared with you
li
h2 Folders
li
a.normalText.menu-indent(href="#")
a.menu-indent(href="#")
i.icon.fa.fa-folder-o
| PhD work
span.normalText (5)
| PhD work
span.small (5)
li
a.normalText.menu-indent(href="#")
a.menu-indent(href="#")
i.icon.fa.fa-folder-o
| Notes
span.normalText (2)
| Notes
span.small (2)
li
a.normalText.menu-indent(href="#")
a.menu-indent(href="#")
i.icon.fa.fa-folder-o
| Papers
span.normalText (1)
| Papers
span.small (1)
.row-spaced
.row-spaced-small
ul.list-unstyled.folders-menu
li
a.normalText.menu-indent(href="#")
a.menu-indent(href="#")
i.icon.fa.fa-plus
| New Folder
-if (settings.enableSubscriptions)
p
.row-spaced
a(href="/user/bonus").btn.btn-info Upgrade Account
.col-md-10
.container-fluid
.row.row-spaced
.row
.col-md-12
form.project-search.form-horizontal(role="form")
.form-group.has-feedback.col-md-7
@ -152,7 +152,7 @@ block content
-else
li
a(href='/project/'+"5369c5737fc6b47f048da1f5"+'/leave', data-name="the project", data-id="5369c5737fc6b47f048da1f5", data-csrf=csrfToken).leaveProject Leave Project
.row
.row.row-spaced
.col-md-12
.card.card-thin
- if (projects.length > 0)

View file

@ -1,24 +1,23 @@
extends ../layout
block content
.container
.row
span4.offset4.span-box
.page-header
h1 Login
.messageArea
form.validate#loginForm(enctype='multipart/form-data', method='post')
input(name='_csrf', type='hidden', value=csrfToken)
input(name='redir', type='hidden', value=redir)
.clearfix
label(for='xlInput') Email
.input
input.span4#email.email.required(type='email', autofocus="autofocus", name='email', placeholder='your@email.com')
.clearfix
label(for='xlInput') Password
.input
input.span4#password.required(type='password', name='password', placeholder='********')
.actions
button.btn-primary.btn.btn-large#login(type='submit') Login
a#passwordReset(href='/user/password/reset') forgot password?
include ../general/small-footer
.content.content-alt
.container
.row
.col-md-6.col-md-offset-3.col-lg-4.col-lg-offset-4
.card
.page-header
h1 Login
.messageArea
form.validate#loginForm(enctype='multipart/form-data', method='post')
input(name='_csrf', type='hidden', value=csrfToken)
input(name='redir', type='hidden', value=redir)
.clearfix
.input
input.span4#email.email.required(type='email', autofocus="autofocus", name='email', placeholder='your@email.com')
.clearfix
.input
input.span4#password.required(type='password', name='password', placeholder='********')
.actions
button.btn-primary.btn.btn-large#login(type='submit') Login
a#passwordReset(href='/user/passwordreset') Forgot your password?

View file

@ -28,6 +28,16 @@ ul.folders-menu {
color: white;
}
}
h2 {
margin-top: @line-height-computed / 2;
margin-bottom: @line-height-computed / 4;
font-size: @font-size-base;
margin-left: 3px;
}
.small {
font-size: 0.8rem;
color: @gray-light;
}
}
form.project-search {

View file

@ -4,6 +4,9 @@
-webkit-box-shadow: 0 2px 4px rgba(0,0,0,0.1);
box-shadow: 0 2px 4px rgba(0,0,0,0.1);
padding: @line-height-computed;
.page-header {
margin: 0 0 1.5625rem;
}
}
.card-thin {

View file

@ -142,5 +142,11 @@ hr {
}
.row-spaced {
margin-bottom: @line-height-computed;
margin-top: @line-height-computed;
}
.row-spaced-small {
margin-top: @line-height-computed / 2;
}

View file

@ -72,7 +72,7 @@
@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px
//** By default, this inherits from the `<body>`.
@headings-font-family: inherit;
@headings-font-family: @font-family-serif;
@headings-font-weight: 500;
@headings-line-height: 1.1;
@headings-color: inherit;