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

Merge pull request #148 from taigaio/issue/1481/blocked-stories-sprint 

Add red color to blocked stories text in sprints
stable
David Barragán Merino 2014-11-11 20:10:25 +01:00
parent 1e34054177 8b2e35feba
commit 81fd0486e3
5 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/partials/views/modules/sprints.jade
View File

@ -19,13 +19,13 @@ section.sprints
div.sprint-table(tg-sprint-sortable) div.sprint-table(tg-sprint-sortable)
div.row.milestone-us-item-row(ng-repeat="us in sprint.user_stories track by us.id") div.row.milestone-us-item-row(ng-repeat="us in sprint.user_stories track by us.id")
div.column-us.width-8 div.column-us
a.us-name.clickable(tg-nav="project-userstories-detail:project=project.slug,ref=us.ref", a.us-name.clickable(tg-nav="project-userstories-detail:project=project.slug,ref=us.ref",
tg-bo-title="'#' + us.ref + ' ' + us.subject", tg-bo-title="'#' + us.ref + ' ' + us.subject",
ng-class="{closed: us.is_closed}") ng-class="{closed: us.is_closed, blocked: us.is_blocked}")
span(tg-bo-ref="us.ref") span(tg-bo-ref="us.ref")
span(tg-bo-bind="us.subject") span(tg-bo-bind="us.subject")
div.column-points.width-1(tg-bo-bind="us.total_points", ng-class="{closed: us.is_closed}") div.column-points.width-1(tg-bo-bind="us.total_points", ng-class="{closed: us.is_closed, blocked: us.is_blocked}")
a.button.button-gray(tg-bo-title="'Go to Taskboard of ' + sprint.name", a.button.button-gray(tg-bo-title="'Go to Taskboard of ' + sprint.name",
tg-nav="project-taskboard:project=project.slug,sprint=sprint.slug", tg-nav="project-taskboard:project=project.slug,sprint=sprint.slug",

6
app/partials/views/modules/taskboard-table.jade
View File

@ -8,10 +8,10 @@ div.taskboard-table
div.taskboard-table-body(tg-taskboard-table-height-fixer) div.taskboard-table-body(tg-taskboard-table-height-fixer)
div.taskboard-table-inner(tg-taskboard-row-width-fixer) div.taskboard-table-inner(tg-taskboard-row-width-fixer)
div.task-row(ng-repeat="us in userstories track by us.id") div.task-row(ng-repeat="us in userstories track by us.id", ng-class="{blocked: us.is_blocked}")
div.taskboard-userstory-box.task-column div.taskboard-userstory-box.task-column(tg-bo-title="us.blocked_note")
div.tag-list div.tag-list
span.tag(ng-repeat="tag in us.tags") {{ tag }} span.tag(ng-repeat="tag in us.tags", tg-bo-bind="tag")
h3.us-title h3.us-title
a(href="", tg-nav="project-userstories-detail:project=project.slug,ref=us.ref", a(href="", tg-nav="project-userstories-detail:project=project.slug,ref=us.ref",
tg-bo-title="'#' + us.ref + ' ' + us.subject") tg-bo-title="'#' + us.ref + ' ' + us.subject")

7
app/styles/layout/backlog.scss
View File

@ -22,10 +22,3 @@
} }
} }
} }
//.menu-secondary.sidebar,
//.backlog {
// height: 100vh;
// overflow-x: auto;
//}

19
app/styles/modules/backlog/sprints.scss
View File

@ -143,12 +143,23 @@
background: lighten($green-taiga, 60%); background: lighten($green-taiga, 60%);
box-shadow: 1px 1px 10px rgba($black, .1); box-shadow: 1px 1px 10px rgba($black, .1);
} }
} }
.column-us { .column-us {
@include table-flex-child(3, 0, 0); @include table-flex-child(3, 0, 0);
@extend %small; @extend %small;
padding: 0 4px; padding: 0 4px;
} }
.us-name {
@include ellipsis(250px);
display: block;
&.closed {
color: lighten($gray-light, 5%);
}
&.blocked {
color: $red;
}
}
.column-points { .column-points {
@include table-flex-child(1, 0, 0); @include table-flex-child(1, 0, 0);
padding: 0 4px; padding: 0 4px;
@ -156,12 +167,8 @@
&.closed { &.closed {
color: lighten($gray-light, 5%); color: lighten($gray-light, 5%);
} }
} &.blocked {
.us-name { color: $red;
@include ellipsis(250px);
display: block;
&.closed {
color: lighten($gray-light, 5%);
} }
} }
} }

20
app/styles/modules/backlog/taskboard-table.scss
View File

@ -59,6 +59,25 @@ $column-margin: 0 10px 0 0;
opacity: 1; opacity: 1;
} }
} }
&.blocked {
.taskboard-userstory-box {
background: rgba($red, .6);
border-radius: 3px;
a,
.points-value {
@include transition(color .3s linear);
color: rgba($white, .9);
&:hover {
@include transition(color .3s linear);
color: rgba($white, 1);
}
}
}
.taskboard-tasks-box {
//@include filter(saturate(20%));
background: rgba($red, .1);
}
}
} }
.taskboard-tasks-box { .taskboard-tasks-box {
background: $whitish; background: $whitish;
@ -66,6 +85,7 @@ $column-margin: 0 10px 0 0;
} }
.taskboard-userstory-box { .taskboard-userstory-box {
padding: .5rem;
.icon { .icon {
@include transition(color .2s linear); @include transition(color .2s linear);
color: $gray-light; color: $gray-light;