From 532ec5e75639f508d0c5b4eb02b149c07a0b568c Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 23 Jul 2014 11:08:55 +0100 Subject: [PATCH 1/3] Make project list look better on a smaller screen --- services/web/app/views/project/list.jade | 4 ++-- .../app/views/project/list/project-list.jade | 22 +++++++++---------- .../public/stylesheets/app/project-list.less | 4 +++- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/services/web/app/views/project/list.jade b/services/web/app/views/project/list.jade index a4abee9197..93bcba6df6 100644 --- a/services/web/app/views/project/list.jade +++ b/services/web/app/views/project/list.jade @@ -18,10 +18,10 @@ block content .content.content-alt(ng-controller="ProjectPageController") .container .row - .col-md-2 + .col-md-2.col-xs-3 include ./list/side-bar - .col-md-10 + .col-md-10.col-xs-9 include ./list/project-list include ./list/modals diff --git a/services/web/app/views/project/list/project-list.jade b/services/web/app/views/project/list/project-list.jade index 6b4579c06d..da3c8d4628 100644 --- a/services/web/app/views/project/list/project-list.jade +++ b/services/web/app/views/project/list/project-list.jade @@ -1,8 +1,8 @@ .row - .col-md-12 + .col-xs-12 form.project-search.form-horizontal(role="form") - .form-group.has-feedback.has-feedback-left.col-md-7 - input.form-control.col-md-7( + .form-group.has-feedback.has-feedback-left.col-xs-7 + input.form-control.col-xs-7( placeholder='Search projects…', autofocus='autofocus', ng-model="searchText", @@ -108,7 +108,7 @@ ) Delete Forever .row.row-spaced - .col-md-12 + .col-xs-12 .card.card-thin ul.list-unstyled.project-list.structured-list( select-all-list, @@ -118,17 +118,17 @@ ) li.container-fluid .row - .col-md-6(ng-click="changePredicate('name')") + .col-xs-6(ng-click="changePredicate('name')") input.select-all( select-all, type="checkbox" ) span.header.clickable Title i.tablesort.fa(ng-class="getSortIconClass('name')") - .col-md-2(ng-click="changePredicate('accessLevel')") + .col-xs-2(ng-click="changePredicate('accessLevel')") span.header.clickable Owner i.tablesort.fa(ng-class="getSortIconClass('accessLevel')") - .col-md-4(ng-click="changePredicate('lastUpdated')") + .col-xs-4(ng-click="changePredicate('lastUpdated')") span.header.clickable Last Modified i.tablesort.fa(ng-class="getSortIconClass('lastUpdated')") li.project_entry.container-fluid( @@ -136,7 +136,7 @@ ng-controller="ProjectListItemController" ) .row - .col-md-6 + .col-xs-6 input.select-item( select-individual, type="checkbox", @@ -152,16 +152,16 @@ ng-repeat='tag in project.tags', ng-click="selectTag(tag)" ) {{tag.name}} - .col-md-2 + .col-xs-2 span.owner {{ownerName()}} - .col-md-4 + .col-xs-4 span.last-modified {{project.lastUpdated | formatDate}} li( ng-if="visibleProjects.length == 0", ng-cloak ) .row - .col-md-12.text-centered + .col-xs-12.text-centered small No projects div.welcome.text-centered(ng-if="projects.length == 0", ng-cloak) h2 Welcome to ShareLaTeX! diff --git a/services/web/public/stylesheets/app/project-list.less b/services/web/public/stylesheets/app/project-list.less index 572e4a015b..7cc23a3d8a 100644 --- a/services/web/public/stylesheets/app/project-list.less +++ b/services/web/public/stylesheets/app/project-list.less @@ -39,6 +39,8 @@ ul.folders-menu { font-size: 0.9rem; color: #333; padding: (@line-height-computed / 4); + display: inline-block; + line-height: 1.2; } } li.active { @@ -69,7 +71,7 @@ ul.folders-menu { position: relative; i { position: absolute; - top: 7px; + top: 5px; left: 6px; } span.name { From 96e99a5cc005f1c7a420b6bfdb15f8d880ae748d Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 23 Jul 2014 11:12:12 +0100 Subject: [PATCH 2/3] Minor project list tweaks --- services/web/app/views/project/list/project-list.jade | 4 ++-- services/web/app/views/project/list/side-bar.jade | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/web/app/views/project/list/project-list.jade b/services/web/app/views/project/list/project-list.jade index da3c8d4628..1d21c0c9fd 100644 --- a/services/web/app/views/project/list/project-list.jade +++ b/services/web/app/views/project/list/project-list.jade @@ -1,8 +1,8 @@ .row .col-xs-12 form.project-search.form-horizontal(role="form") - .form-group.has-feedback.has-feedback-left.col-xs-7 - input.form-control.col-xs-7( + .form-group.has-feedback.has-feedback-left.col-md-7.col-xs-12 + input.form-control.col-md-7.col-xs-12( placeholder='Search projects…', autofocus='autofocus', ng-model="searchText", diff --git a/services/web/app/views/project/list/side-bar.jade b/services/web/app/views/project/list/side-bar.jade index b1bbf99a09..7be015e7b0 100644 --- a/services/web/app/views/project/list/side-bar.jade +++ b/services/web/app/views/project/list/side-bar.jade @@ -65,9 +65,9 @@ span.name {{tag.name}} span.subdued ({{tag.project_ids.length}}) li(ng-cloak) - a(href, ng-click="openNewTagModal()") + a.tag(href, ng-click="openNewTagModal()") i.fa.fa-fw.fa-plus - | New Folder + span.name New Folder .row-spaced(ng-if="projects.length == 0", ng-cloak) .first-project From cca50cf64c804eadcc1035bf370e321393bdd418 Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 23 Jul 2014 11:18:42 +0100 Subject: [PATCH 3/3] Auto focus login, register and password fields --- services/web/app/views/user/login.jade | 3 ++- services/web/app/views/user/passwordReset.jade | 3 ++- services/web/app/views/user/register.jade | 3 ++- services/web/app/views/user/setPassword.jade | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/services/web/app/views/user/login.jade b/services/web/app/views/user/login.jade index c0b8827d89..af77e3a739 100644 --- a/services/web/app/views/user/login.jade +++ b/services/web/app/views/user/login.jade @@ -19,7 +19,8 @@ block content required, placeholder='email@example.com', ng-model="email", - ng-model-options="{ updateOn: 'blur' }" + ng-model-options="{ updateOn: 'blur' }", + autofocus ) span.small.text-primary(ng-show="loginForm.email.$invalid && loginForm.email.$dirty") | Must be an email address diff --git a/services/web/app/views/user/passwordReset.jade b/services/web/app/views/user/passwordReset.jade index 88e9131d52..11957138d8 100644 --- a/services/web/app/views/user/passwordReset.jade +++ b/services/web/app/views/user/passwordReset.jade @@ -26,7 +26,8 @@ block content name='email', placeholder='email@example.com', required, - ng-model="email" + ng-model="email", + autofocus ) span.small.text-primary( ng-show="passwordResetForm.email.$invalid && passwordResetForm.email.$dirty" diff --git a/services/web/app/views/user/register.jade b/services/web/app/views/user/register.jade index 30889eacaf..91d6dcd9ba 100644 --- a/services/web/app/views/user/register.jade +++ b/services/web/app/views/user/register.jade @@ -31,7 +31,8 @@ block content required, ng-model="email", ng-init="email = #{JSON.stringify(new_email)}", - ng-model-options="{ updateOn: 'blur' }" + ng-model-options="{ updateOn: 'blur' }", + autofocus ) span.small.text-primary(ng-show="registerForm.email.$invalid && registerForm.email.$dirty") | Must be an email address diff --git a/services/web/app/views/user/setPassword.jade b/services/web/app/views/user/setPassword.jade index 1aa2c2a76b..067a0dfecb 100644 --- a/services/web/app/views/user/setPassword.jade +++ b/services/web/app/views/user/setPassword.jade @@ -26,7 +26,8 @@ block content name='password', placeholder='new password', required, - ng-model="password" + ng-model="password", + autofocus ) span.small.text-primary( ng-show="passwordResetForm.password.$invalid && passwordResetForm.password.$dirty"