From c466025df4704bfdaa196143616e1063f8a75f28 Mon Sep 17 00:00:00 2001 From: James Allen Date: Fri, 12 Jan 2018 11:44:58 +0000 Subject: [PATCH] Go back to allowing v1 projects to be imported --- .../web/app/views/project/list/v1-item.pug | 22 ++++++++----------- .../public/stylesheets/app/project-list.less | 7 ++++-- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/services/web/app/views/project/list/v1-item.pug b/services/web/app/views/project/list/v1-item.pug index 31fd036f7a..4fcbe96ad7 100644 --- a/services/web/app/views/project/list/v1-item.pug +++ b/services/web/app/views/project/list/v1-item.pug @@ -1,20 +1,16 @@ .col-xs-6 - span.v1-badge( - aria-label=translate("v1_badge") - tooltip-template="'v1ProjectTooltipTemplate'" - tooltip-append-to-body="true" - ) + .select-item + span.v1-badge( + aria-label=translate("v1_badge") + tooltip-template="'v1ProjectTooltipTemplate'" + tooltip-append-to-body="true" + ) span if settings.overleaf && settings.overleaf.host - a.projectName( - href=settings.overleaf.host + "/{{project.id}}" - target="_blank" + button.btn.btn-link.projectName( + ng-click="openV1ImportModal(project)" + stop-propagation="click" ) {{project.name}} - //- To re-enable the import dialog (may need style changing for padding/line-height): - //- button.btn.btn-link.projectName( - //- ng-click="openV1ImportModal(project)" - //- stop-propagation="click" - //- ) {{project.name}} .col-xs-2 span.owner {{ownerName()}} diff --git a/services/web/public/stylesheets/app/project-list.less b/services/web/public/stylesheets/app/project-list.less index 3a5ea560db..fc6777dea8 100644 --- a/services/web/public/stylesheets/app/project-list.less +++ b/services/web/public/stylesheets/app/project-list.less @@ -336,6 +336,10 @@ ul.project-list { } .projectName { margin-right: @line-height-computed / 4; + padding: 0; + vertical-align: inherit; + white-space: normal; + text-align: left; } .tag-label { @@ -373,8 +377,7 @@ ul.project-list { } .v1-badge { - margin-right: 9px; - margin-left: 7px; + margin-left: -4px; } } i.tablesort {