taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set icon-key for private projects and icon-blocked for blocked items

stable
Daniel García 2018-11-20 18:26:27 +01:00 committed by Alex Hermida
parent 98db0de351
commit f9d2201b0a
18 changed files with 44 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/modules/discover/discover-search/discover-search.scss
View File

@ -86,6 +86,10 @@
color: $gray-light;
display: inline-block;
margin-right: .5rem;
svg {
fill: $gray-light;
stroke: $gray-light;
}
&.active {
color: $primary;
svg {

3
app/modules/home/projects/home-project-list.jade
View File

@ -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",

2
app/modules/profile/profile-favs/items/project.jade
View File

@ -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"
)

2
app/modules/projects/create/import-project-form-common/project-privacy.jade
View File

@ -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")

2
app/modules/projects/listing/projects-listing.jade
View File

@ -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(

2
app/modules/projects/listing/styles/project-list.scss
View File

@ -13,7 +13,7 @@
margin: 0;
}
}
.icon-lock,
.icon-key,
.icon-badge,
.icon-blocked-project {
@include svg-size();

2
app/modules/projects/project/project.jade
View File

@ -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"
)

2
app/modules/projects/transfer/transfer-project.jade
View File

@ -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")

4
app/partials/common/components/block-button.jade
View File

@ -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")

2
app/partials/common/lightbox/lightbox-create-edit/lb-create-edit-issue.jade
View File

@ -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")

2
app/partials/common/lightbox/lightbox-create-edit/lb-create-edit-task.jade
View File

@ -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")

2
app/partials/common/lightbox/lightbox-create-edit/lb-create-edit-us.jade
View File

@ -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")

30
app/styles/components/list-items.scss
View File

@ -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);
}

4
app/styles/components/private.scss
View File

@ -1,4 +0,0 @@
.icon-lock {
fill: $gray-light;
margin-left: .5rem;
}

2
app/styles/dependencies/mixins/project-card.scss
View File

@ -25,7 +25,9 @@
display: flex;
margin-top: auto;
svg {
&:not(.icon-key) {
@include svg-size(.75rem);
}
fill: currentColor;
margin-right: .25rem;
}

2
app/styles/modules/common/ticket-data.scss
View File

@ -246,7 +246,7 @@
max-width: 1.25rem;
width: 100%;
}
.icon-lock {
.icon-key {
margin: 0;
}
a {

7
app/styles/modules/home-project.scss
View File

@ -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;

20
app/svg/sprite.svg
View File

@ -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"></path>
</symbol>
<symbol id="icon-lock" viewBox="0 0 1024 1024">
<title>lock</title>
<path
class="path1"
d="M427.571 0c-149.486 0-270.822 121.6-270.822 271.411v119.639h-156.749v632.95h1024v-632.96h-156.749v-119.642c0-149.811-121.349-271.411-270.822-271.411h-168.832zM427.571 64.136h168.832c115.141 0 206.838 91.889 206.838 207.276v119.639h-582.502v-119.639c0-115.384 91.692-207.276 206.83-207.276zM64 455.201h896v504.678h-896v-504.678zM480 586.721v229.325h64v-229.325h-64z"></path>
<symbol id="icon-key" viewBox="0 0 95.779 46.567">
<title>private</title>
<path style="isolation:auto;mix-blend-mode:normal;marker:none" d="M19.226.238A18.847 23.072 0 0 0 .379 23.31a18.847 23.072 0 0 0 18.847 23.072 18.847 23.072 0 0 0 18.771-21.229h23.015v15.034h9.378V25.153h10.366v15.034h9.378V25.153h5.162v-9.378h-58.28A18.847 23.072 0 0 0 19.225.238zm0 10.043a9.438 13.03 0 0 1 9.438 13.03 9.438 13.03 0 0 1-9.438 13.029 9.438 13.03 0 0 1-9.438-13.03 9.438 13.03 0 0 1 9.438-13.029z" overflow="visible"/>
</symbol>
<symbol id="icon-promote" viewBox="0 0 1024 1024">
<title>promote</title>
@ -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"></path>
</symbol>
<symbol id="icon-unlock" viewBox="0 0 1024 1024">
<title>unlock</title>
<path
class="path1"
d="M427.571 0c-146.12 0-265.318 116.191-270.618 261.325h64.036c5.158-110.612 94.822-197.197 206.592-197.197h168.832c115.139 0 206.835 91.886 206.835 207.273v119.639h-803.249v632.947h1024v-632.96h-156.749v-119.642c0-149.806-121.352-271.411-270.822-271.411zM64 455.194h896v504.678h-896zM480 586.701v229.325h64v-229.325z"></path>
<symbol id="icon-block" width="17" height="23" viewBox="0 0 17 23">
<title>block</title>
<path d="M1 18C1 20.5 2.5 21.5 4.5 21.5C6.5 21.5 6.5 21.5 8.5 21.5C10.5 21.5 11.5 20 12 18.5L13 15.5" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="bevel"/>
<path d="M1 5C1 9.33333 1 16 1 18M13 15.5L16 11" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="bevel"/>
<path d="M7 1V12" stroke="white" stroke-width="1.5" stroke-linecap="round"/>
<path d="M4 1.91663L4 12" stroke="white" stroke-width="1.5" stroke-linecap="round"/>
<path d="M10 1.91663L10 12" stroke="white" stroke-width="1.5" stroke-linecap="round"/>
</symbol>
<symbol id="icon-client-requirement" viewBox="0 0 1024 1024">
<title>client-requirement</title>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 74 KiB