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

Repair new icons

stable
Daniel García 2018-11-22 11:44:04 +01:00 committed by Alex Hermida
parent 32bd886ae8
commit 22e5a8e247
23 changed files with 513 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/modules/components/project-menu/project-menu.jade
View File

@ -114,5 +114,5 @@ nav.menu(
aria-label="{{'PROJECT.SECTION.ADMIN' | translate}}" aria-label="{{'PROJECT.SECTION.ADMIN' | translate}}"
tabindex="8" tabindex="8"
) )
tg-svg(svg-icon="icon-admin") tg-svg(svg-icon="icon-settings")
span.helper(translate="PROJECT.SECTION.ADMIN") span.helper(translate="PROJECT.SECTION.ADMIN")

10
app/modules/components/tips/tip.jade
View File

@ -1,12 +1,12 @@
div.tip(ng-class="tipColor") div.tip(ng-class="tip.color")
p.title(translate="TIPS.TIPS_TITLE") 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") p(ng-switch-when="icon")
tg-svg(svg-icon="{{ icon }}") tg-svg(svg-icon="{{ tip.icon }}")
span(ng-if="icon == 'icon-upvote'") 5 span(ng-if="tip.icon == 'icon-upvote'") 5
tg-board-zoom(ng-switch-when="range") tg-board-zoom(ng-switch-when="range")

13
app/modules/components/tips/tips.directive.coffee
View File

@ -30,7 +30,7 @@ tipsDirective = (tgLoader, $translate) ->
{ contentType: "icon", icon: "icon-promote", message: "PROMOTE"} { contentType: "icon", icon: "icon-promote", message: "PROMOTE"}
{ contentType: "icon", icon: "icon-bulk", message: "BULK"} { contentType: "icon", icon: "icon-bulk", message: "BULK"}
{ contentType: "range", message: "ZOOM"} { contentType: "range", message: "ZOOM"}
{ message: "CUSTOM_FIELDS"} { contentType: "icon", icon: "icon-settings", message: "CUSTOM_FIELDS"}
{ contentType: "arrows", message: "SLIDE_ARROWS"} { contentType: "arrows", message: "SLIDE_ARROWS"}
] ]
@ -43,11 +43,12 @@ tipsDirective = (tgLoader, $translate) ->
loadTip = () -> loadTip = () ->
tip = tips[randomInt(tips.length - 1)] tip = tips[randomInt(tips.length - 1)]
scope.contentType = tip.contentType scope.tip = {
scope.message = "TIPS.TIP_#{tip.message}" contentType: tip.contentType
scope.icon = tip.icon message: "TIPS.TIP_#{tip.message}"
icon: tip.icon
scope.tipColor = "tip-color-#{randomInt(5)}" color: "tip-color-#{randomInt(5)}"
}
return { return {
link: link, link: link,

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

@ -69,7 +69,7 @@ section.home-project-list(ng-if="vm.projects.size")
ng-if="::project.get('is_private')" ng-if="::project.get('is_private')"
title="{{ 'PROJECT.PRIVATE' | translate }}" title="{{ 'PROJECT.PRIVATE' | translate }}"
) )
tg-svg(svg-icon="icon-key") tg-svg(svg-icon="icon-private")
a.see-more-projects-btn.button-gray( a.see-more-projects-btn.button-gray(
href="#", href="#",
ng-show="vm.projects.size", ng-show="vm.projects.size",

1
app/modules/navigation-bar/navigation-bar.jade
View File

@ -49,6 +49,7 @@ nav.navbar(ng-if="vm.isEnabledHeader")
a( a(
href="#", href="#",
tg-nav="discover", tg-nav="discover",
ng-class="{active: vm.active}"
title="{{'PROJECT.NAVIGATION.DISCOVER_TITLE' | translate}}", title="{{'PROJECT.NAVIGATION.DISCOVER_TITLE' | translate}}",
) )
tg-svg(svg-icon="icon-discover") tg-svg(svg-icon="icon-discover")

2
app/modules/navigation-bar/navigation-bar.scss
View File

@ -211,7 +211,7 @@ $dropdown-width: 350px;
color: $white; color: $white;
font-size: .7rem; font-size: .7rem;
height: 20px; height: 20px;
left: 50px; left: 52px;
line-height: 20px; line-height: 20px;
position: absolute; position: absolute;
text-align: center; text-align: center;

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

@ -21,7 +21,7 @@
tg-svg( tg-svg(
ng-if="::vm.item.get('is_private')" ng-if="::vm.item.get('is_private')"
svg-icon="icon-key" svg-icon="icon-private"
svg-title-translate="PROJECT.PRIVATE" svg-title-translate="PROJECT.PRIVATE"
) )

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

@ -26,5 +26,5 @@
required required
) )
label(for="template-private") label(for="template-private")
tg-svg(svg-icon="icon-key") tg-svg(svg-icon="icon-private")
span(translate="PROJECT.CREATE.PRIVATE_PROJECT") span(translate="PROJECT.CREATE.PRIVATE_PROJECT")

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

@ -38,7 +38,7 @@
) {{project.get('name')}} ) {{project.get('name')}}
tg-svg( tg-svg(
ng-if="project.get('is_private')", ng-if="project.get('is_private')",
svg-icon="icon-key", svg-icon="icon-private",
svg-title-translate="PROJECT.PRIVATE" svg-title-translate="PROJECT.PRIVATE"
) )
tg-svg( tg-svg(

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

@ -13,7 +13,7 @@
margin: 0; margin: 0;
} }
} }
.icon-key, .icon-private,
.icon-badge, .icon-badge,
.icon-blocked-project { .icon-blocked-project {
@include svg-size(); @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")}} span.project-name {{::vm.project.get("name")}}
tg-svg( tg-svg(
ng-if="::vm.project.get('is_private')" ng-if="::vm.project.get('is_private')"
svg-icon="icon-key" svg-icon="icon-private"
svgTitleTranslate: "PROJECT.PRIVATE" 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")}} h3.transfer-project-title {{::vm.project.get("name")}}
.transfer-project-statistics .transfer-project-statistics
span.transfer-project-private(ng-if="vm.project.get('is_private')") 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(translate="ADMIN.PROJECT_TRANSFER.PRIVATE")
span.transfer-project-members span.transfer-project-members
tg-svg(svg-icon="icon-team") 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="" href=""
title="{{ 'COMMON.BLOCK_TITLE' | translate }}" title="{{ 'COMMON.BLOCK_TITLE' | translate }}"
) )
tg-svg(svg-icon="icon-block") tg-svg(svg-icon="icon-lock")
a.button-red.item-unblock( a.button-red.item-unblock(
href="" href=""
title="{{ 'COMMON.UNBLOCK_TITLE' | translate }}" title="{{ 'COMMON.UNBLOCK_TITLE' | translate }}"
) )
tg-svg(svg-icon="icon-block") tg-svg(svg-icon="icon-unlock")

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 }}" title="{{ 'COMMON.BLOCK_TITLE' | translate }}"
ng-class="{ 'button-red item-unblock': obj.is_blocked, 'item-block': !obj.is_blocked }" 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")

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 }}" title="{{ 'COMMON.BLOCK_TITLE' | translate }}"
ng-class="{ 'button-red item-unblock': obj.is_blocked, 'item-block': !obj.is_blocked }" 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")

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 }}" title="{{ 'COMMON.BLOCK_TITLE' | translate }}"
ng-class="{ 'button-red item-unblock': obj.is_blocked, 'item-block': !obj.is_blocked }" 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")

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

@ -39,7 +39,7 @@
} }
.list-itemtype-project-data-wrapper { .list-itemtype-project-data-wrapper {
display: flex; display: flex;
.icon-key { .icon-private {
fill: $gray-light; fill: $gray-light;
height: 22px; height: 22px;
margin-left: .5rem; margin-left: .5rem;

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

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

6
app/styles/modules/common/nav.scss
View File

@ -24,7 +24,7 @@ tg-project-menu {
text-align: center; text-align: center;
a { a {
display: block; display: block;
padding: 1.1rem .8rem; padding: 1rem .7rem;
position: relative; position: relative;
} }
li { li {
@ -66,8 +66,8 @@ tg-project-menu {
} }
svg { svg {
fill: $white; fill: $white;
height: 1.5rem; height: 1.7rem;
width: 1.5rem; width: 1.7rem;
path { path {
opacity: 1; opacity: 1;
} }

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

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

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

@ -22,7 +22,7 @@
.intro-title { .intro-title {
align-items: center; align-items: center;
display: flex; display: flex;
.icon-key { .icon-private {
fill: $gray-light; fill: $gray-light;
height: 24px; height: 24px;
margin-left: .25rem; margin-left: .25rem;

567
app/svg/sprite.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 79 KiB

2
app/themes/taiga/variables.scss
View File

@ -22,7 +22,7 @@ $primary: #5b8200;
$primary-dark: #879b89; $primary-dark: #879b89;
$primary-background: #E8F5E3; $primary-background: #E8F5E3;
$secondary-dark: #627695; $secondary-dark: #718377;
//Status colors //Status colors
$red-light: #ff8282; $red-light: #ff8282;