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

Merge pull request #1134 from taigaio/issue/4624/iocaine 

Issue/4624/iocaine
stable
David Barragán Merino 2016-10-13 12:06:55 +02:00 committed by GitHub
parent 4a6f254d17 57a5b2fe1f
commit 861480a30f
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/locales/taiga/locale-en.json
View File

@ -41,7 +41,7 @@
"LOGOUT": "Logout",
"EXTERNAL_USER": "an external user",
"GENERIC_ERROR": "One of our Oompa Loompas says {{error}}.",
"IOCAINE_TEXT": "Feeling a bit overwhelmed by a task? Make sure others know about it by clicking on Iocaine when editing a task. It's possible to become immune to this (fictional) deadly poison by consuming small amounts over time just as it's possible to get better at what you do by occasionally taking on extra challenges!",
"IOCAINE_TEXT": "This member is feeling a bit overwhelmed by this task. Will become immune to the iocaine poison over time with your help. For now, may need a hug.",
"CLIENT_REQUIREMENT": "Client requirement is new requirement that was not previously expected and it is required to be part of the project",
"TEAM_REQUIREMENT": "Team requirement is a requirement that must exist in the project but should have no cost for the client",
"OWNER": "Project Owner",

7
app/modules/components/card/card-templates/card-data.jade
View File

@ -10,6 +10,13 @@
ng-if="vm.item.getIn(['model', 'total_points'])"
) {{"COMMON.FIELDS.POINTS" | translate}} {{vm.item.getIn(['model', 'total_points'])}}
.card-statistics
.statistic.card-iocaine(
ng-if="vm.item.getIn(['model', 'is_iocaine'])"
title="{{'COMMON.IOCAINE_TEXT' | translate}}"
)
tg-svg(
svg-icon="icon-iocaine"
)
.statistic.card-votes(ng-class="{'active': vm.item.getIn(['model', 'is_voter'])}")
tg-svg(svg-icon="icon-upvote")
span {{vm.item.getIn(['model', 'total_voters'])}}

5
app/modules/components/card/card-templates/card-owner.jade
View File

@ -5,11 +5,6 @@
ng-class="{'is-iocaine': vm.item.getIn(['model', 'is_iocaine'])}"
tg-avatar="vm.item.get('assigned_to')"
)
tg-svg(
ng-if="vm.item.getIn(['model', 'is_iocaine'])"
svg-icon="icon-iocaine"
svg-title="COMMON.IOCAINE_TEXT"
)
span.card-owner-name(ng-if="vm.visible('owner')") {{vm.item.getIn(['assigned_to', 'full_name'])}}
div(ng-if="!vm.visible('owner')")
include card-title

18
app/modules/components/card/card.scss
View File

@ -79,16 +79,6 @@
line-height: 0;
position: relative;
}
.icon-iocaine {
@include svg-size(1.2rem);
background: rgba($blackish, .8);
border-radius: 4px 0 0;
bottom: .25rem;
fill: $whitish;
padding: .25rem;
position: absolute;
right: .5rem;
}
.is-iocaine {
filter: hue-rotate(265deg) saturate(3);
}
@ -164,19 +154,25 @@
.statistic {
align-content: center;
display: flex;
margin-left: .75rem;
margin-left: .5rem;
&.active {
color: $primary-light;
svg {
fill: currentColor;
}
}
&.card-iocaine {
cursor: help;
}
}
.icon {
@include svg-size(.75rem);
fill: lighten($gray-light, 25%);
margin-right: .2rem;
}
.icon-iocaine {
fill: $purple-eggplant;
}
}
.card-completion {