Просмотр исходного кода

Merge pull request #290 from sharelatex/revert-258-ja-allow-v1-imports

Revert "Go back to allowing v1 projects to be imported"
James Allen 8 лет назад
Родитель
Сommit
08593f1f4b

+ 13 - 9
services/web/app/views/project/list/v1-item.pug

@@ -1,16 +1,20 @@
 .col-xs-6
 .col-xs-6
-	.select-item
-		span.v1-badge(
-			aria-label=translate("v1_badge")
-			tooltip-template="'v1ProjectTooltipTemplate'"
-			tooltip-append-to-body="true"
-		)
+	span.v1-badge(
+		aria-label=translate("v1_badge")
+		tooltip-template="'v1ProjectTooltipTemplate'"
+		tooltip-append-to-body="true"
+	)
 	span
 	span
 		if settings.overleaf && settings.overleaf.host
 		if settings.overleaf && settings.overleaf.host
-			button.btn.btn-link.projectName(
-				ng-click="openV1ImportModal(project)"
-				stop-propagation="click"
+			a.projectName(
+				href=settings.overleaf.host + "/{{project.id}}"
+				target="_blank"
 			) {{project.name}}
 			) {{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
 .col-xs-2
 	span.owner {{ownerName()}}
 	span.owner {{ownerName()}}

+ 2 - 5
services/web/public/stylesheets/app/project-list.less

@@ -336,10 +336,6 @@ ul.project-list {
 		}
 		}
 		.projectName {
 		.projectName {
 			margin-right: @line-height-computed / 4;
 			margin-right: @line-height-computed / 4;
-			padding: 0;
-			vertical-align: inherit;
-			white-space: normal;
-			text-align: left;
 		}
 		}
 
 
 		.tag-label {
 		.tag-label {
@@ -377,7 +373,8 @@ ul.project-list {
 			}
 			}
 
 
 		.v1-badge {
 		.v1-badge {
-			margin-left: -4px;
+			margin-right: 9px;
+			margin-left: 7px;
 		}
 		}
 	}
 	}
 	i.tablesort {
 	i.tablesort {