Procházet zdrojové kódy

Restyle step 2 for side-by-side layout

Alasdair Smith před 8 roky
rodič
revize
61900cc1ea

+ 20 - 17
services/web/app/views/project/list/modals.pug

@@ -321,13 +321,13 @@ script(type="text/ng-template", id="v1ImportModalTemplate")
 
 
 	.modal-body.v1-import-wrapper
 	.modal-body.v1-import-wrapper
 		.v1-import-step-1(ng-show="step === 1")
 		.v1-import-step-1(ng-show="step === 1")
-			.row
-				.col-xs-6
+			.v1-import-row
+				.v1-import-col
 					img.v1-import-img(
 					img.v1-import-img(
 						src="/img/v1-import/v2-editor.png"
 						src="/img/v1-import/v2-editor.png"
 						alt="The new V2 Editor."
 						alt="The new V2 Editor."
 					)
 					)
-				.col-xs-6.col-offset-6
+				.v1-import-col
 					h2.v1-import-title Try the Overleaf v2 Editor
 					h2.v1-import-title Try the Overleaf v2 Editor
 					p The Overleaf v2 editor has many great new features including:
 					p The Overleaf v2 editor has many great new features including:
 					ul
 					ul
@@ -340,20 +340,23 @@ script(type="text/ng-template", id="v1ImportModalTemplate")
 			p.v1-import-cta Would you like to move #[strong {{project.name}}] into Overleaf v2?
 			p.v1-import-cta Would you like to move #[strong {{project.name}}] into Overleaf v2?
 
 
 		.v1-import-step-2(ng-show="step === 2")
 		.v1-import-step-2(ng-show="step === 2")
-			div.v1-import-warning(aria-label="Warning symbol.")
-				i.fa.fa-exclamation-triangle
-			h2.v1-import-title #[strong Warning:] Overleaf v2 is Experimental
-			p We are still working hard to bring some Overleaf v1 features to the v2 editor. If you move this project to v2 now, you will:
-			ul
-				li Lose access your project via git
-				li Not be able to use the Journals and Services menu to submit directly to our partners
-				li Not be able to use the Rich Text (WYSIWYG) mode
-				li Not be able to use linked files (to URLs or to files in other Overleaf projects)
-				li Not be able to use some bibliography integrations (Zotero, CiteULike)
-				li Lose access to your labelled versions and not be able to create new labelled versions
-			p
-				strong Please note: you cannot move this project back to v1 once you have moved it to v2. If this is an important project, please consider making a clone in v1 before you move the project to v2.
-			p Are you sure you want to move #[strong {{project.name}}] into Overleaf v2?
+			.v1-import-row
+				.v1-import-warning.v1-import-col(aria-label="Warning symbol.")
+					i.fa.fa-exclamation-triangle
+				.v1-import-col
+					h2.v1-import-title #[strong Warning:] Overleaf v2 is Experimental
+					p We are still working hard to bring some Overleaf v1 features to the v2 editor. If you move this project to v2 now, you will:
+					ul
+						li Lose access your project via git
+						li Not be able to use the Journals and Services menu to submit directly to our partners
+						li Not be able to use the Rich Text (WYSIWYG) mode
+						li Not be able to use linked files (to URLs or to files in other Overleaf projects)
+						li Not be able to use some bibliography integrations (Zotero, CiteULike)
+						li Lose access to your labelled versions and not be able to create new labelled versions
+			.v1-import-cta
+				p
+					strong Please note: you cannot move this project back to v1 once you have moved it to v2. If this is an important project, please consider making a clone in v1 before you move the project to v2.
+				p Are you sure you want to move #[strong {{project.name}}] into Overleaf v2?
 
 
 	.modal-footer.v1-import-footer
 	.modal-footer.v1-import-footer
 		div(ng-show="step === 1")
 		div(ng-show="step === 1")

+ 16 - 0
services/web/public/stylesheets/app/list/v1-import-modal.less

@@ -2,6 +2,19 @@
 	text-align: center;
 	text-align: center;
 }
 }
 
 
+.v1-import-row {
+	display: flex;
+	align-items: center;
+}
+
+.v1-import-col {
+	flex-basis: 50%;
+	flex-grow: 0;
+	flex-shrink: 0;
+	padding-left: 15px;
+	padding-right: 15px;
+}
+
 .v1-import-img {
 .v1-import-img {
 	width: 100%;
 	width: 100%;
 	margin-top: 30px;
 	margin-top: 30px;
@@ -9,6 +22,9 @@
 
 
 .v1-import-cta {
 .v1-import-cta {
 	margin-top: 20px;
 	margin-top: 20px;
+	margin-left: auto;
+	margin-right: auto;
+	width: 80%;
 	text-align: center;
 	text-align: center;
 }
 }