diff --git a/js/components/tables/task_order_list.js b/js/components/tables/task_order_list.js index d9cc3a2f..04d32389 100644 --- a/js/components/tables/task_order_list.js +++ b/js/components/tables/task_order_list.js @@ -46,7 +46,8 @@ export default { displayName: 'Period of Performance', attr: 'start_date', sortFunc: numericSort, - width: '50%', + width: "50%", + class: "period-of-performance" }, { displayName: 'Initial Value', diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index 6702d67d..16aa41c5 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -82,10 +82,17 @@ .view-task-order-link { margin-left: $gap * 2; + + .icon--tiny { + @include icon-size(10); + margin-left: 1rem; + } } .portfolio-total-balance { margin-top: -$gap; + margin-bottom: 3rem; + .row { flex-direction: row-reverse; margin: 2 * $gap 0; @@ -98,8 +105,26 @@ } table { + th{ + .icon { + margin-left: 1rem; + } + + &.period-of-performance { + color: $color-blue; + + .icon { + @include icon-color($color-primary) + } + } + } + td.unused-balance { color: $color-red; } + + .label--expired { + background-color: $color-gray-light; + } } } diff --git a/templates/portfolios/task_orders/index.html b/templates/portfolios/task_orders/index.html index 783c676d..4b004e62 100644 --- a/templates/portfolios/task_orders/index.html +++ b/templates/portfolios/task_orders/index.html @@ -8,7 +8,7 @@ {% macro ViewLink(task_order) %} View - {{ Icon("caret_right") }} + {{ Icon("caret_right", classes="icon--tiny") }} {% endmacro %} @@ -27,10 +27,10 @@ !{ col.displayName } @@ -63,7 +63,7 @@ View - {{ Icon("caret_right") }} + {{ Icon("caret_right", classes="icon--tiny") }} @@ -135,7 +135,7 @@ {% endif %} {% if expired_task_orders %} - {{ TaskOrderList(expired_task_orders, label='', expired=True) }} + {{ TaskOrderList(expired_task_orders, label='expired', expired=True) }} {% endif %}