From 4dcbbcac10edb6205c9e4f0baebdc4a9a2fa7a2a Mon Sep 17 00:00:00 2001 From: xaviju Date: Fri, 3 Mar 2017 11:43:15 +0100 Subject: [PATCH] Fix buttons --- app/locales/taiga/locale-en.json | 4 ++-- .../select-import-user-lightbox.jade | 18 ++++++------------ .../select-import-user-lightbox.scss | 18 +++++++++++++----- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json index cd0e85ae..e4d94405 100644 --- a/app/locales/taiga/locale-en.json +++ b/app/locales/taiga/locale-en.json @@ -985,9 +985,9 @@ "ARCHIVED": "Archived", "ARCHIVED_DESCRIPTION": "You have archived projects, Do you want to import your archived projects?", "WHO_IS": "Their tasks will be assigned to ...", - "WRITE_EMAIL": "Or if you want, write the email that their use in Taiga", + "WRITE_EMAIL": "Or if you want, write the email that this user uses in Taiga", "SEARCH_CONTACT": "Or if you want, search in your contacts", - "WRITE_EMAIL_LABEL": "Write the email that their use in Taiga", + "WRITE_EMAIL_LABEL": "Write the email that this user uses in Taiga", "EMAIL_NOT_FOUND": "We did not find any users with that email", "ACCEEDE": "Acceede", "PROJECT_MEMBERS": "Project Members", diff --git a/app/modules/projects/create/select-import-user-lightbox/select-import-user-lightbox.jade b/app/modules/projects/create/select-import-user-lightbox/select-import-user-lightbox.jade index 1030b1c9..a4242a1d 100644 --- a/app/modules/projects/create/select-import-user-lightbox/select-import-user-lightbox.jade +++ b/app/modules/projects/create/select-import-user-lightbox/select-import-user-lightbox.jade @@ -47,12 +47,9 @@ tg-lightbox-close(on-close="vm.onClose()") translate="PROJECT.IMPORT.ASSIGN" ) - .search-user-mode - p - a( - href="" - ng-click="vm.mode = 'search'" - ) {{'PROJECT.IMPORT.SEARCH_CONTACT' | translate}} + button.search-user-mode( + ng-click="vm.mode = 'search'" + ) {{'PROJECT.IMPORT.SEARCH_CONTACT' | translate}} div(ng-if="vm.mode == 'search'") fieldset @@ -82,9 +79,6 @@ tg-lightbox-close(on-close="vm.onClose()") .more-users(ng-if="filteredCollection.length >= 5") span(translate="COMMON.ASSIGNED_TO.TOO_MANY") - .search-user-mode - p - a( - href="" - ng-click="vm.mode = 'mail'" - ) {{'PROJECT.IMPORT.WRITE_EMAIL' | translate}} + button.search-user-mode( + ng-click="vm.mode = 'mail'" + ) {{'PROJECT.IMPORT.WRITE_EMAIL' | translate}} diff --git a/app/modules/projects/create/select-import-user-lightbox/select-import-user-lightbox.scss b/app/modules/projects/create/select-import-user-lightbox/select-import-user-lightbox.scss index 09c29ed2..83605d28 100644 --- a/app/modules/projects/create/select-import-user-lightbox/select-import-user-lightbox.scss +++ b/app/modules/projects/create/select-import-user-lightbox/select-import-user-lightbox.scss @@ -27,7 +27,9 @@ tg-select-import-user-lightbox { text-align: center; } .more-users { - padding: .5rem; + @include font-type(light); + @include font-size(small); + padding: 1rem; text-align: center; } .group { @@ -42,10 +44,16 @@ tg-select-import-user-lightbox { } } .search-user-mode { - border-top: 1px solid $gray-light; - margin-top: 1rem; - padding-top: 1rem; - text-align: center; + @include font-size(small); + background: none; + margin-top: 2rem; + padding: .5rem; + text-align: left; + transition: .2s; + width: 100%; + &:hover { + color: $primary; + } } label { display: block;