diff --git a/app/modules/discover/discover-search/discover-search.scss b/app/modules/discover/discover-search/discover-search.scss index 8e50ad3c..bc8c92ec 100644 --- a/app/modules/discover/discover-search/discover-search.scss +++ b/app/modules/discover/discover-search/discover-search.scss @@ -86,6 +86,10 @@ color: $gray-light; display: inline-block; margin-right: .5rem; + svg { + fill: $gray-light; + stroke: $gray-light; + } &.active { color: $primary; svg { diff --git a/app/modules/home/projects/home-project-list.jade b/app/modules/home/projects/home-project-list.jade index 73cf4ca6..a894b786 100644 --- a/app/modules/home/projects/home-project-list.jade +++ b/app/modules/home/projects/home-project-list.jade @@ -69,8 +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-lock") - + tg-svg(svg-icon="icon-key") a.see-more-projects-btn.button-gray( href="#", ng-show="vm.projects.size", diff --git a/app/modules/profile/profile-favs/items/project.jade b/app/modules/profile/profile-favs/items/project.jade index bcc8e293..5d74ee34 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-lock" + svg-icon="icon-key" 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 aebbd5f4..f31aa26e 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-lock") + tg-svg(svg-icon="icon-key") 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 9c72475b..0c9b1378 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-lock", + svg-icon="icon-key", 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 2bbf058f..c43b0952 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-lock, + .icon-key, .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 fd5949e1..6311d95f 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-lock" + svg-icon="icon-key" svgTitleTranslate: "PROJECT.PRIVATE" ) diff --git a/app/modules/projects/transfer/transfer-project.jade b/app/modules/projects/transfer/transfer-project.jade index 4fac79aa..491fb9a5 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-lock") + tg-svg(svg-icon="icon-key") 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 ad993bd6..6b4b2bce 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-lock") + tg-svg(svg-icon="icon-block") a.button-red.item-unblock( href="" title="{{ 'COMMON.UNBLOCK_TITLE' | translate }}" ) - tg-svg(svg-icon="icon-unlock") + tg-svg(svg-icon="icon-block") 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 fd566c01..3aab3efe 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-lock") + tg-svg(svg-icon="icon-key") 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 dc13ecef..ae0ff7dc 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-lock") + tg-svg(svg-icon="icon-key") 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 8217b13a..7bacdb0d 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-lock") + tg-svg(svg-icon="icon-key") diff --git a/app/styles/components/list-items.scss b/app/styles/components/list-items.scss index 10483b4f..7116f865 100644 --- a/app/styles/components/list-items.scss +++ b/app/styles/components/list-items.scss @@ -31,14 +31,6 @@ .list-itemtype-project { @include list-itemtype-common; justify-content: space-between; - &.blocked-project { - .list-itemtype-track, - .list-itemtype-project-image, - .list-itemtype-project-name, - .list-itemtype-project-description { - opacity: .4; - } - } h2 { @include font-size(large); } @@ -47,6 +39,13 @@ } .list-itemtype-project-data-wrapper { display: flex; + .icon-key { + fill: $gray-light; + height: 22px; + margin-left: .5rem; + padding-top: .5rem; + width: 22px; + } } .list-itemtype-project-image { flex-shrink: 0; @@ -79,21 +78,6 @@ .list-itemtype-ticket { @include list-itemtype-common; position: relative; - &.blocked-project { - .ticket-project, - .ticket-type, - .ticket-status, - .ticket-id, - .list-itemtype-avatar, - .list-itemtype-track, - .ticket-title { - opacity: .4; - } - .icon-blocked-project { - @include svg-size(); - margin-left: .25rem; - } - } h2 { @include font-size(medium); } diff --git a/app/styles/components/private.scss b/app/styles/components/private.scss index f89e0620..e69de29b 100644 --- a/app/styles/components/private.scss +++ b/app/styles/components/private.scss @@ -1,4 +0,0 @@ -.icon-lock { - fill: $gray-light; - margin-left: .5rem; -} diff --git a/app/styles/dependencies/mixins/project-card.scss b/app/styles/dependencies/mixins/project-card.scss index dfb03bf6..09b5cbf4 100644 --- a/app/styles/dependencies/mixins/project-card.scss +++ b/app/styles/dependencies/mixins/project-card.scss @@ -25,7 +25,9 @@ display: flex; margin-top: auto; svg { - @include svg-size(.75rem); + &:not(.icon-key) { + @include svg-size(.75rem); + } fill: currentColor; margin-right: .25rem; } diff --git a/app/styles/modules/common/ticket-data.scss b/app/styles/modules/common/ticket-data.scss index f8c4279a..1406ce0a 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-lock { + .icon-key { margin: 0; } a { diff --git a/app/styles/modules/home-project.scss b/app/styles/modules/home-project.scss index db929b69..ef263d89 100644 --- a/app/styles/modules/home-project.scss +++ b/app/styles/modules/home-project.scss @@ -22,6 +22,13 @@ .intro-title { align-items: center; display: flex; + .icon-key { + fill: $gray-light; + height: 24px; + margin-left: .25rem; + margin-top: 1rem; + width: 24px; + } } h1 { color: $primary; diff --git a/app/svg/sprite.svg b/app/svg/sprite.svg index 24f69d04..66547ae6 100644 --- a/app/svg/sprite.svg +++ b/app/svg/sprite.svg @@ -14,11 +14,9 @@ class="path1" d="M613.658 0c-3.54 0-7.091 0.225-10.619 0.699-70.636 1.408-141.466-1.833-211.986 1.587-37.804 7.936-60.948 53.517-45.542 88.858 2.109 12.795 9.257 29.535 9.139 40.584h-73.738v65.213h51.474c-3.405 29.655-35.712 42.196-57.779 55.916-46.546 26.419-94.093 64.614-103.898 120.356-10.227 52.465-1.293 106.273-4.36 159.035 0.827 144.205-2.36 288.563 1.787 432.691 6.569 36.488 43.971 62.572 80.435 58.388 139.121 1.203 278.272-0.189 417.382 0.673 45.512-0.87 91.387 1.147 136.678-2.808 34.877-8.166 58.957-44.416 54.989-79.685 1.216-140.723-0.23-281.472 0.717-422.195-0.707-46.787 0.748-93.814-2.926-140.442-10.112-57.498-56.658-100.413-106.401-126.382-22.648-12.966-52.257-26.836-57.19-55.539h3.866c4.25 0.545 8.724 0.538 13.158 0h33.556v-31.002c0.064-1.132 0.064-2.245 0-3.338v-30.871h-74.138c7.567-31.309 24.717-66.726 6.958-97.741-12.442-22.262-36.782-33.946-61.568-33.989zM610.15 63.173c4.357-0.072 8.259 0.614 9.779 4.070-1.088 12.298-7.278 23.68-9.505 35.738-4.004 8.678-0.556 22.17-7.526 28.749h-182.17c-4.787-22.492-14.659-45.542-15.078-67.86 5.048-1.331 10.412-0.154 15.549-0.297 58.798 0.998 117.663-0.118 176.422 0.082 3.343 0.415 8.166-0.415 12.526-0.486zM396.314 196.941h232.842c-0.243 42.463 30.687 78.029 66.591 97.083 36.792 22.712 84.070 43.635 95.959 89.472 5.089 11.827 1.756 18.371-12.201 14.651-183.245-0.087-366.848 0.174-549.862-0.133 3.599-39.025 36.027-69.645 69.99-86.564 37.806-21.594 82.772-46.523 92.826-92.731 2.734-6.543-0.046-17.797 3.845-21.78zM348.741 462.643c37.996 15.301 59.156 54.118 90.394 78.833 16.691-11.948 36.183-19.999 56.428-23.475 35.814-8.1 71.352 5.018 103.357 20.045 30.38-24.205 46.188-45.901 72.179-65.708 15.693-15.094 42.765-8.422 42.939 12.836-20.787 36.956-53.368 59.73-82.918 88.586 21.555 30.216 30.625 69.773 21.683 106.066-0.783 18.662-18.514 30.502-20.769 48.456 20.813 30.428 48.397 51.374 71.122 78.31 19.021 10.888 8.975 43.848-12.672 43.172-37.76-20.736-59.387-60.57-94.894-84.173-4.518 13.368-0.223 33.723-0.627 50.010 3.584 16.289-8.934 32.548-25.349 34.028-32.768-1.766-65.723 0.384-98.555-0.87-18.918 1.178-26.358-20.045-25.101-35.64-0.051-12.948 7.68-33.546-8.576-39.634-32.138 15.514-52.813 44.518-87.782 67.904-12.173 17.004-41.505 3.021-39.724-16.594 25.933-40.543 69.13-64.691 101.934-98.778-39.209-39.56-38.492-107.75-4.854-150.51-20.014-25.974-46.446-45.875-68.516-69.939-18.58-9.733-10.593-42.586 10.296-42.918zM524.9 560.399c-1.889-0.051-3.789-0.033-5.693 0.059-37.427-0.128-73.536 24.916-86.897 60.475-15.045 32.584 0.709 72.602 30.828 90.373 16.358 4.698 28.237 19.835 29.696 36.736 3.602 17.357-7.834 36.285 1.649 52.142 16.41 6.108 36.956 6.973 54.182 1.172 5.24-17.836-2.202-38.868 0.461-58.143 5.548-28.426 40.96-33.928 53.752-57.3 28.127-53.921-19.52-123.86-77.983-125.517zM487.089 616.399c12.16-0.287 20.070 11.807 22.426 22.408 5.274 16.973-5.898 43.32-26.675 39.117-29.665-6.738-26.957-59.715 4.25-61.522zM556.526 616.43c11.105 0.538 18.304 10.752 20.659 21.082 5.957 17.132-4.447 44.032-25.702 40.468-29.737-5.862-27.745-58.616 2.77-61.524 0.776-0.051 1.536-0.061 2.273-0.026zM230.075 923.758c54.469 2.732 109.053-0.614 163.571 0.768h401.044c-0.179 11.73 6.060 33.116-10.691 35.22-37.952 3.83-76.006-0.904-114.107 1.080-144.691-0.479-289.459 1.697-434.099-1.254-10.45-7.46-7.117-26.235-5.74-35.814z"> - - lock - + + private + promote @@ -32,11 +30,13 @@ class="path1" d="M273.382 0v143.726h-273.382v64h119.77v816.282h780.8v-816.282h123.43v-64h-277.018v-143.726zM337.382 64h345.6v79.726h-345.6zM183.782 207.726h89.6v682.982h64v-682.982h140.8v682.982h64v-682.982h140.8v682.982h64v-682.982h89.6v752.282h-652.8z"> - - unlock - + + block + + + + + client-requirement