diff --git a/app/modules/components/project-menu/project-menu.jade b/app/modules/components/project-menu/project-menu.jade index 63d95d51..38fe6d0d 100644 --- a/app/modules/components/project-menu/project-menu.jade +++ b/app/modules/components/project-menu/project-menu.jade @@ -114,5 +114,5 @@ nav.menu( aria-label="{{'PROJECT.SECTION.ADMIN' | translate}}" tabindex="8" ) - tg-svg(svg-icon="icon-admin") + tg-svg(svg-icon="icon-settings") span.helper(translate="PROJECT.SECTION.ADMIN") diff --git a/app/modules/components/tips/tip.jade b/app/modules/components/tips/tip.jade index 041c6283..6d9d3d0f 100644 --- a/app/modules/components/tips/tip.jade +++ b/app/modules/components/tips/tip.jade @@ -1,12 +1,12 @@ -div.tip(ng-class="tipColor") +div.tip(ng-class="tip.color") p.title(translate="TIPS.TIPS_TITLE") - p(translate="{{ message }}") + p(translate="{{ tip.message }}") - div(ng-switch="contentType", translate-cloak="{{ message }}") + div(ng-switch="tip.contentType", translate-cloak="{{ tip.message }}") p(ng-switch-when="icon") - tg-svg(svg-icon="{{ icon }}") - span(ng-if="icon == 'icon-upvote'") 5 + tg-svg(svg-icon="{{ tip.icon }}") + span(ng-if="tip.icon == 'icon-upvote'") 5 tg-board-zoom(ng-switch-when="range") diff --git a/app/modules/components/tips/tips.directive.coffee b/app/modules/components/tips/tips.directive.coffee index 30d8da36..f3d3c808 100644 --- a/app/modules/components/tips/tips.directive.coffee +++ b/app/modules/components/tips/tips.directive.coffee @@ -30,7 +30,7 @@ tipsDirective = (tgLoader, $translate) -> { contentType: "icon", icon: "icon-promote", message: "PROMOTE"} { contentType: "icon", icon: "icon-bulk", message: "BULK"} { contentType: "range", message: "ZOOM"} - { message: "CUSTOM_FIELDS"} + { contentType: "icon", icon: "icon-settings", message: "CUSTOM_FIELDS"} { contentType: "arrows", message: "SLIDE_ARROWS"} ] @@ -43,11 +43,12 @@ tipsDirective = (tgLoader, $translate) -> loadTip = () -> tip = tips[randomInt(tips.length - 1)] - scope.contentType = tip.contentType - scope.message = "TIPS.TIP_#{tip.message}" - scope.icon = tip.icon - - scope.tipColor = "tip-color-#{randomInt(5)}" + scope.tip = { + contentType: tip.contentType + message: "TIPS.TIP_#{tip.message}" + icon: tip.icon + color: "tip-color-#{randomInt(5)}" + } return { link: link, diff --git a/app/modules/home/projects/home-project-list.jade b/app/modules/home/projects/home-project-list.jade index a894b786..e77b2191 100644 --- a/app/modules/home/projects/home-project-list.jade +++ b/app/modules/home/projects/home-project-list.jade @@ -69,7 +69,7 @@ section.home-project-list(ng-if="vm.projects.size") ng-if="::project.get('is_private')" title="{{ 'PROJECT.PRIVATE' | translate }}" ) - tg-svg(svg-icon="icon-key") + tg-svg(svg-icon="icon-private") a.see-more-projects-btn.button-gray( href="#", ng-show="vm.projects.size", diff --git a/app/modules/navigation-bar/navigation-bar.jade b/app/modules/navigation-bar/navigation-bar.jade index 13f7c1df..a1704b9e 100644 --- a/app/modules/navigation-bar/navigation-bar.jade +++ b/app/modules/navigation-bar/navigation-bar.jade @@ -49,6 +49,7 @@ nav.navbar(ng-if="vm.isEnabledHeader") a( href="#", tg-nav="discover", + ng-class="{active: vm.active}" title="{{'PROJECT.NAVIGATION.DISCOVER_TITLE' | translate}}", ) tg-svg(svg-icon="icon-discover") diff --git a/app/modules/navigation-bar/navigation-bar.scss b/app/modules/navigation-bar/navigation-bar.scss index a2bedba1..9c2f8e66 100644 --- a/app/modules/navigation-bar/navigation-bar.scss +++ b/app/modules/navigation-bar/navigation-bar.scss @@ -211,7 +211,7 @@ $dropdown-width: 350px; color: $white; font-size: .7rem; height: 20px; - left: 50px; + left: 52px; line-height: 20px; position: absolute; text-align: center; diff --git a/app/modules/profile/profile-favs/items/project.jade b/app/modules/profile/profile-favs/items/project.jade index 5d74ee34..e951ad07 100644 --- a/app/modules/profile/profile-favs/items/project.jade +++ b/app/modules/profile/profile-favs/items/project.jade @@ -21,7 +21,7 @@ tg-svg( ng-if="::vm.item.get('is_private')" - svg-icon="icon-key" + svg-icon="icon-private" svg-title-translate="PROJECT.PRIVATE" ) diff --git a/app/modules/projects/create/import-project-form-common/project-privacy.jade b/app/modules/projects/create/import-project-form-common/project-privacy.jade index f31aa26e..219a440c 100644 --- a/app/modules/projects/create/import-project-form-common/project-privacy.jade +++ b/app/modules/projects/create/import-project-form-common/project-privacy.jade @@ -26,5 +26,5 @@ required ) label(for="template-private") - tg-svg(svg-icon="icon-key") + tg-svg(svg-icon="icon-private") span(translate="PROJECT.CREATE.PRIVATE_PROJECT") diff --git a/app/modules/projects/listing/projects-listing.jade b/app/modules/projects/listing/projects-listing.jade index 0c9b1378..4817158d 100644 --- a/app/modules/projects/listing/projects-listing.jade +++ b/app/modules/projects/listing/projects-listing.jade @@ -38,7 +38,7 @@ ) {{project.get('name')}} tg-svg( ng-if="project.get('is_private')", - svg-icon="icon-key", + svg-icon="icon-private", svg-title-translate="PROJECT.PRIVATE" ) tg-svg( diff --git a/app/modules/projects/listing/styles/project-list.scss b/app/modules/projects/listing/styles/project-list.scss index dd841076..34d38d26 100644 --- a/app/modules/projects/listing/styles/project-list.scss +++ b/app/modules/projects/listing/styles/project-list.scss @@ -13,7 +13,7 @@ margin: 0; } } - .icon-key, + .icon-private, .icon-badge, .icon-blocked-project { @include svg-size(); diff --git a/app/modules/projects/project/project.jade b/app/modules/projects/project/project.jade index 6311d95f..b4ded523 100644 --- a/app/modules/projects/project/project.jade +++ b/app/modules/projects/project/project.jade @@ -18,7 +18,7 @@ div.wrapper span.project-name {{::vm.project.get("name")}} tg-svg( ng-if="::vm.project.get('is_private')" - svg-icon="icon-key" + svg-icon="icon-private" svgTitleTranslate: "PROJECT.PRIVATE" ) diff --git a/app/modules/projects/transfer/transfer-project.jade b/app/modules/projects/transfer/transfer-project.jade index 491fb9a5..33ceecf3 100644 --- a/app/modules/projects/transfer/transfer-project.jade +++ b/app/modules/projects/transfer/transfer-project.jade @@ -9,7 +9,7 @@ h3.transfer-project-title {{::vm.project.get("name")}} .transfer-project-statistics span.transfer-project-private(ng-if="vm.project.get('is_private')") - tg-svg(svg-icon="icon-key") + tg-svg(svg-icon="icon-private") span(translate="ADMIN.PROJECT_TRANSFER.PRIVATE") span.transfer-project-members tg-svg(svg-icon="icon-team") diff --git a/app/partials/common/components/block-button.jade b/app/partials/common/components/block-button.jade index 6b4b2bce..ad993bd6 100644 --- a/app/partials/common/components/block-button.jade +++ b/app/partials/common/components/block-button.jade @@ -2,9 +2,9 @@ a.button-gray.item-block( href="" title="{{ 'COMMON.BLOCK_TITLE' | translate }}" ) - tg-svg(svg-icon="icon-block") + tg-svg(svg-icon="icon-lock") a.button-red.item-unblock( href="" title="{{ 'COMMON.UNBLOCK_TITLE' | translate }}" ) - tg-svg(svg-icon="icon-block") + tg-svg(svg-icon="icon-unlock") diff --git a/app/partials/common/lightbox/lightbox-create-edit/lb-create-edit-issue.jade b/app/partials/common/lightbox/lightbox-create-edit/lb-create-edit-issue.jade index 3aab3efe..539e21f4 100644 --- a/app/partials/common/lightbox/lightbox-create-edit/lb-create-edit-issue.jade +++ b/app/partials/common/lightbox/lightbox-create-edit/lb-create-edit-issue.jade @@ -30,4 +30,4 @@ div.ticket-detail-settings title="{{ 'COMMON.BLOCK_TITLE' | translate }}" ng-class="{ 'button-red item-unblock': obj.is_blocked, 'item-block': !obj.is_blocked }" ) - tg-svg(svg-icon="icon-key") + tg-svg(svg-icon="icon-block") diff --git a/app/partials/common/lightbox/lightbox-create-edit/lb-create-edit-task.jade b/app/partials/common/lightbox/lightbox-create-edit/lb-create-edit-task.jade index ae0ff7dc..02c1ae13 100644 --- a/app/partials/common/lightbox/lightbox-create-edit/lb-create-edit-task.jade +++ b/app/partials/common/lightbox/lightbox-create-edit/lb-create-edit-task.jade @@ -30,4 +30,4 @@ div.ticket-detail-settings title="{{ 'COMMON.BLOCK_TITLE' | translate }}" ng-class="{ 'button-red item-unblock': obj.is_blocked, 'item-block': !obj.is_blocked }" ) - tg-svg(svg-icon="icon-key") + tg-svg(svg-icon="icon-block") diff --git a/app/partials/common/lightbox/lightbox-create-edit/lb-create-edit-us.jade b/app/partials/common/lightbox/lightbox-create-edit/lb-create-edit-us.jade index 7bacdb0d..4d188f26 100644 --- a/app/partials/common/lightbox/lightbox-create-edit/lb-create-edit-us.jade +++ b/app/partials/common/lightbox/lightbox-create-edit/lb-create-edit-us.jade @@ -35,4 +35,4 @@ div.ticket-detail-settings title="{{ 'COMMON.BLOCK_TITLE' | translate }}" ng-class="{ 'button-red item-unblock': obj.is_blocked, 'item-block': !obj.is_blocked }" ) - tg-svg(svg-icon="icon-key") + tg-svg(svg-icon="icon-private") diff --git a/app/styles/components/list-items.scss b/app/styles/components/list-items.scss index 7116f865..ebfdc264 100644 --- a/app/styles/components/list-items.scss +++ b/app/styles/components/list-items.scss @@ -39,7 +39,7 @@ } .list-itemtype-project-data-wrapper { display: flex; - .icon-key { + .icon-private { fill: $gray-light; height: 22px; margin-left: .5rem; diff --git a/app/styles/dependencies/mixins/project-card.scss b/app/styles/dependencies/mixins/project-card.scss index 53786931..88014bef 100644 --- a/app/styles/dependencies/mixins/project-card.scss +++ b/app/styles/dependencies/mixins/project-card.scss @@ -25,9 +25,13 @@ display: flex; margin-top: auto; svg { - &:not(.icon-key) { + &:not(.icon-private) { @include svg-size(.75rem); } + &.icon-private { + @include svg-size(1.2rem); + margin-left: 1em; + } fill: currentColor; margin-right: .25rem; } diff --git a/app/styles/modules/common/nav.scss b/app/styles/modules/common/nav.scss index 8e06ccbb..724e8aae 100644 --- a/app/styles/modules/common/nav.scss +++ b/app/styles/modules/common/nav.scss @@ -24,7 +24,7 @@ tg-project-menu { text-align: center; a { display: block; - padding: 1.1rem .8rem; + padding: 1rem .7rem; position: relative; } li { @@ -66,8 +66,8 @@ tg-project-menu { } svg { fill: $white; - height: 1.5rem; - width: 1.5rem; + height: 1.7rem; + width: 1.7rem; path { opacity: 1; } diff --git a/app/styles/modules/common/ticket-data.scss b/app/styles/modules/common/ticket-data.scss index 1406ce0a..c5ba8c65 100644 --- a/app/styles/modules/common/ticket-data.scss +++ b/app/styles/modules/common/ticket-data.scss @@ -246,7 +246,7 @@ max-width: 1.25rem; width: 100%; } - .icon-key { + .icon-private { margin: 0; } a { diff --git a/app/styles/modules/home-project.scss b/app/styles/modules/home-project.scss index 4792cd65..02990b74 100644 --- a/app/styles/modules/home-project.scss +++ b/app/styles/modules/home-project.scss @@ -22,7 +22,7 @@ .intro-title { align-items: center; display: flex; - .icon-key { + .icon-private { fill: $gray-light; height: 24px; margin-left: .25rem; diff --git a/app/svg/sprite.svg b/app/svg/sprite.svg index 93b567c6..9d543033 100644 --- a/app/svg/sprite.svg +++ b/app/svg/sprite.svg @@ -1,99 +1,476 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + iocaine + + + + private + + + + promote + + + + trash + + + + lock + + + + unlock + + + + client-requirement + + + + project + + + + team-requirement + + + + add + + + + scrum + + + + bulk + + + + close + + + + dashboard + + + + discover + + + + drag + + + + exclamation + + + + flag + + + + fold-column + + + + fold-row + + + + graph + + + + + + + kanban + + + + + + + like-empty + + + + like + + + + activity + + + + question + + + + search + + + + settings + + + + team + + + + timeline + + + + unfold-column + + + + unfold-row + + + + unwatch + + + + user + + + + wiki + + + + archive + + + + arrow-down + + + + arrow-left + + + + arrow-right + + + + arrow-up + + + + attachment + + + + briefcase + + + + + + + bug + + + + capslock + + + + check + + + + clipboard + + + + clock + + + + document + + + + documents + + + + downvote + + + + edit + + + + error + + + + filters-empty + + + + filters + + + + github + + + + maximize + + + + minimize + + + + move + + + + reload + + + + save + + + + upload + + + + upvote + + + + writer + + + + watch + + + + check-empty + + + + task + + + + api + + + + customize + + + + feel-love + + + + highly-designed + + + + integration + + + + lend-hand + + + + powerful + + + + smiley + + + + social-management + + + + speak-up + + + + gallery + + + + list + + + + Looking for people + + + + Owner Badge + + + + Exclamation + + + + Blocked Project + + + + + Add user + + + + View more + + + + Merge + + + + Fill + + + + + + + Broken Link + + + + + + + Duplicate + + + + + + + + + + + + + diff --git a/app/themes/taiga/variables.scss b/app/themes/taiga/variables.scss index 64c69da8..07019dbe 100755 --- a/app/themes/taiga/variables.scss +++ b/app/themes/taiga/variables.scss @@ -22,7 +22,7 @@ $primary: #5b8200; $primary-dark: #879b89; $primary-background: #E8F5E3; -$secondary-dark: #627695; +$secondary-dark: #718377; //Status colors $red-light: #ff8282;