From 9ec8c4fba2567217dd861d65b85b977aaeca4001 Mon Sep 17 00:00:00 2001 From: xaviju Date: Wed, 8 Mar 2017 09:04:41 +0100 Subject: [PATCH] Import project style fixes --- .../create-project-form.jade | 10 ++-- .../create/import-taiga/import-taiga.jade | 5 +- .../import/import-project.controller.coffee | 3 ++ .../create/import/import-project.jade | 47 ++++++++++--------- app/styles/dependencies/mixins/create.scss | 23 +++++---- 5 files changed, 46 insertions(+), 42 deletions(-) diff --git a/app/modules/projects/create/create-project-form/create-project-form.jade b/app/modules/projects/create/create-project-form/create-project-form.jade index c5a29054..31c0c01c 100644 --- a/app/modules/projects/create/create-project-form/create-project-form.jade +++ b/app/modules/projects/create/create-project-form/create-project-form.jade @@ -1,15 +1,15 @@ .create-project - h1.create-project-title(ng-if="vm.type == 'scrum'") + .create-project-title-wrapper(ng-if="vm.type == 'scrum'") tg-svg(svg-icon="icon-scrum") - span(translate="PROJECT.CREATE.TEMPLATE_SCRUM") + h1.create-project-title(translate="PROJECT.CREATE.TEMPLATE_SCRUM") h3.create-project-description( ng-if="vm.type == 'scrum'" translate="PROJECT.CREATE.TEMPLATE_SCRUM_DESC" ) - h1.create-project-title(ng-if="vm.type == 'kanban'") + .create-project-title-wrapper(ng-if="vm.type == 'kanban'") tg-svg(svg-icon="icon-kanban") - span(translate="PROJECT.CREATE.TEMPLATE_KANBAN") + h1.create-project-title(translate="PROJECT.CREATE.TEMPLATE_KANBAN") h3.create-project-description( ng-if="vm.type == 'kanban'" translate="PROJECT.CREATE.TEMPLATE_KANBAN_DESC" @@ -29,4 +29,4 @@ can-create-private-projects="vm.canCreatePrivateProjects" ) - div(ng-include="'projects/create/import-project-form-common/actions.html'") \ No newline at end of file + div(ng-include="'projects/create/import-project-form-common/actions.html'") diff --git a/app/modules/projects/create/import-taiga/import-taiga.jade b/app/modules/projects/create/import-taiga/import-taiga.jade index 08c0fd20..da97034b 100644 --- a/app/modules/projects/create/import-taiga/import-taiga.jade +++ b/app/modules/projects/create/import-taiga/import-taiga.jade @@ -8,8 +8,5 @@ input.hidden( alt="Taiga Logo" ) .import-project-name-wrapper - p.import-project-name( - href="#" - title="Taiga" - ) Taiga + span.import-project-name Taiga p.import-project-description(translate="PROJECT.IMPORT.TAIGA.SELECTOR") diff --git a/app/modules/projects/create/import/import-project.controller.coffee b/app/modules/projects/create/import/import-project.controller.coffee index 1eb492b2..d2967f64 100644 --- a/app/modules/projects/create/import/import-project.controller.coffee +++ b/app/modules/projects/create/import/import-project.controller.coffee @@ -110,4 +110,7 @@ class ImportProjectController cancelCurrentImport: () -> @location.url(@tgNavUrls.resolve('create-project-import')) + backToCreate: () -> + @location.url(@tgNavUrls.resolve('create-project')) + angular.module("taigaProjects").controller("ImportProjectCtrl", ImportProjectController) diff --git a/app/modules/projects/create/import/import-project.jade b/app/modules/projects/create/import/import-project.jade index a2014d45..aae83c75 100644 --- a/app/modules/projects/create/import/import-project.jade +++ b/app/modules/projects/create/import/import-project.jade @@ -3,20 +3,20 @@ ul.import-project-from li.import-project-from-site( - tg-click-input-file, + tg-click-input-file tg-import-taiga ) - li.import-project-from-site(ng-click="vm.unfoldOptions('jira')", ng-if="vm.isActiveImporter('jira')") + li.import-project-from-site( + ng-click="vm.unfoldOptions('jira')" + ng-if="vm.isActiveImporter('jira')" + ) .import-project-logo img( src="/#{v}/images/import-logos/jira.png" alt="Jira Logo" ) .import-project-name-wrapper - a.import-project-name( - href="#" - title="Jira" - ) Jira + span.import-project-name Jira p.import-project-description(translate="PROJECT.IMPORT.JIRA.SELECTOR") fieldset.import-project-url(ng-if="vm.unfoldedOptions == 'jira'") label( @@ -33,46 +33,47 @@ title="{{'PROJECT.IMPORT.ACCEEDE' | translate}}" translate="PROJECT.IMPORT.ACCEEDE" ) - li.import-project-from-site(ng-click="vm.select('github')", ng-if="vm.isActiveImporter('github')") + li.import-project-from-site( + ng-click="vm.select('github')" + ng-if="vm.isActiveImporter('github')" + ) .import-project-logo img( src="/#{v}/images/import-logos/github.png" alt="Github Logo" ) .import-project-name-wrapper - a.import-project-name( - href="#" - title="Github" - ) Github + span.import-project-name Github p.import-project-description(translate="PROJECT.IMPORT.GITHUB.SELECTOR") - li.import-project-from-site(ng-click="vm.select('trello')", ng-if="vm.isActiveImporter('trello')") + li.import-project-from-site( + ng-click="vm.select('trello')" + ng-if="vm.isActiveImporter('trello')" + ) .import-project-logo img( src="/#{v}/images/import-logos/trello.png" alt="Trello Logo" ) .import-project-name-wrapper - a.import-project-name( - href="#" - title="Trello" - ) Trello + span.import-project-name Trello p.import-project-description(translate="PROJECT.IMPORT.TRELLO.SELECTOR") - li.import-project-from-site(ng-click="vm.select('asana')", ng-if="vm.isActiveImporter('asana')") + li.import-project-from-site( + ng-click="vm.select('asana')" + ng-if="vm.isActiveImporter('asana')" + ) .import-project-logo img( src="/#{v}/images/import-logos/asana.png" alt="Asana Logo" ) .import-project-name-wrapper - a.import-project-name( - href="#" - title="Asana" - ) Asana + span.import-project-name Asana p.import-project-description(translate="PROJECT.IMPORT.ASANA.SELECTOR") .create-project-action - a.trans-button.create-project-action-back( - tg-nav="create-project", + button.trans-button.create-project-action-cancel( + type="button" + ng-click="vm.backToCreate()" title="{{'PROJECT.CREATE.BACK' | translate}}" translate="PROJECT.CREATE.BACK" ) diff --git a/app/styles/dependencies/mixins/create.scss b/app/styles/dependencies/mixins/create.scss index fe59f338..f396854c 100644 --- a/app/styles/dependencies/mixins/create.scss +++ b/app/styles/dependencies/mixins/create.scss @@ -36,28 +36,28 @@ } } - &-description, - &-title { - text-align: center; - } - - &-title { + &-title-wrapper { align-items: center; display: flex; justify-content: center; margin-bottom: 0; - tg-svg { - display: flex; + .create-project-title { + display: inline-block; } - .icon { - @include svg-size(1.5rem); + @include svg-size(1.75rem); margin-right: .5rem; vertical-align: middle; } } + &-title, + &-description { + margin: 0; + text-align: center; + } + &-description { color: $gray-light; margin-bottom: 2rem; @@ -115,6 +115,9 @@ display: flex; justify-content: center; position: relative; + &:hover { + color: currentColor; + } } li { &:hover {