From b68d6411ee3826f211b51476df3c2f9de2c54cd1 Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Mon, 27 Nov 2017 14:25:15 +0000 Subject: [PATCH] Basic styles for import modal --- services/web/app/views/project/list/modals.pug | 8 ++++---- .../coffee/main/project-list/project-list.coffee | 2 ++ .../stylesheets/app/list/v1-import-modal.less | 13 +++++++++++++ .../web/public/stylesheets/app/project-list.less | 2 ++ 4 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 services/web/public/stylesheets/app/list/v1-import-modal.less diff --git a/services/web/app/views/project/list/modals.pug b/services/web/app/views/project/list/modals.pug index 9ae5ba0ea7..b57290cf44 100644 --- a/services/web/app/views/project/list/modals.pug +++ b/services/web/app/views/project/list/modals.pug @@ -325,14 +325,14 @@ script(type="text/ng-template", id="v1ImportModalTemplate") alt="The new V2 Editor." ) - h2 Try importing your project to V2! + h2.v1-import-title Try importing your project to V2! p Some exciting copy about the new features: ul li Some stuff li Some more stuff li Yet more stuff - .modal-footer - button.btn.btn-primary(ng-click="openV1()") #{translate("open_in_v1")} - button.btn.btn-primary(ng-click="import()") #{translate("import_to_v2")} + .modal-footer.v1-import-footer + button.btn.btn-primary.v1-import-btn(ng-click="openV1()") #{translate("open_in_v1")} + button.btn.btn-primary.v1-import-btn(ng-click="import()") #{translate("import_to_v2")} diff --git a/services/web/public/coffee/main/project-list/project-list.coffee b/services/web/public/coffee/main/project-list/project-list.coffee index bb1d1acc56..1a7384fa01 100644 --- a/services/web/public/coffee/main/project-list/project-list.coffee +++ b/services/web/public/coffee/main/project-list/project-list.coffee @@ -447,6 +447,8 @@ define [ $modal.open( templateUrl: 'v1ImportModalTemplate' controller: 'UploadProjectModalController' + size: 'lg' + windowClass: 'v1-import-modal' resolve: project: () -> project ) diff --git a/services/web/public/stylesheets/app/list/v1-import-modal.less b/services/web/public/stylesheets/app/list/v1-import-modal.less new file mode 100644 index 0000000000..9e7282be9f --- /dev/null +++ b/services/web/public/stylesheets/app/list/v1-import-modal.less @@ -0,0 +1,13 @@ +.v1-import-title { + text-align: center; +} + +.v1-import-footer { + display: flex; + justify-content: space-evenly; + text-align: left; +} + + .v1-import-btn { + width: 20rem; + } \ No newline at end of file diff --git a/services/web/public/stylesheets/app/project-list.less b/services/web/public/stylesheets/app/project-list.less index e541afd5cc..732b2e7903 100644 --- a/services/web/public/stylesheets/app/project-list.less +++ b/services/web/public/stylesheets/app/project-list.less @@ -1,3 +1,5 @@ +@import "./list/v1-import-modal.less"; + @announcements-shadow: 0 2px 20px rgba(0, 0, 0, 0.5); @keyframes pulse {