Fix styling on header and icons

This commit is contained in:
leigh-mil 2019-01-24 19:58:59 -05:00
parent 526ab59024
commit b22d202186
3 changed files with 32 additions and 6 deletions

View File

@ -46,7 +46,8 @@ export default {
displayName: 'Period of Performance', displayName: 'Period of Performance',
attr: 'start_date', attr: 'start_date',
sortFunc: numericSort, sortFunc: numericSort,
width: '50%', width: "50%",
class: "period-of-performance"
}, },
{ {
displayName: 'Initial Value', displayName: 'Initial Value',

View File

@ -82,10 +82,17 @@
.view-task-order-link { .view-task-order-link {
margin-left: $gap * 2; margin-left: $gap * 2;
.icon--tiny {
@include icon-size(10);
margin-left: 1rem;
}
} }
.portfolio-total-balance { .portfolio-total-balance {
margin-top: -$gap; margin-top: -$gap;
margin-bottom: 3rem;
.row { .row {
flex-direction: row-reverse; flex-direction: row-reverse;
margin: 2 * $gap 0; margin: 2 * $gap 0;
@ -98,8 +105,26 @@
} }
table { table {
th{
.icon {
margin-left: 1rem;
}
&.period-of-performance {
color: $color-blue;
.icon {
@include icon-color($color-primary)
}
}
}
td.unused-balance { td.unused-balance {
color: $color-red; color: $color-red;
} }
.label--expired {
background-color: $color-gray-light;
}
} }
} }

View File

@ -8,7 +8,7 @@
{% macro ViewLink(task_order) %} {% macro ViewLink(task_order) %}
<a href="{{ url_for('portfolios.view_task_order', portfolio_id=portfolio.id, task_order_id=task_order.id) }}" class="icon-link view-task-order-link"> <a href="{{ url_for('portfolios.view_task_order', portfolio_id=portfolio.id, task_order_id=task_order.id) }}" class="icon-link view-task-order-link">
<span>View</span> <span>View</span>
{{ Icon("caret_right") }} {{ Icon("caret_right", classes="icon--tiny") }}
</a> </a>
{% endmacro %} {% endmacro %}
@ -27,10 +27,10 @@
!{ col.displayName } !{ col.displayName }
<template v-if="col.sortFunc"> <template v-if="col.sortFunc">
<span class="sorting-direction" v-if="col.displayName === sortInfo.columnName && sortInfo.isAscending"> <span class="sorting-direction" v-if="col.displayName === sortInfo.columnName && sortInfo.isAscending">
{{ Icon("caret_down") }} {{ Icon("caret_down", classes="icon--tiny") }}
</span> </span>
<span class="sorting-direction" v-if="col.displayName === sortInfo.columnName && !sortInfo.isAscending"> <span class="sorting-direction" v-if="col.displayName === sortInfo.columnName && !sortInfo.isAscending">
{{ Icon("caret_up") }} {{ Icon("caret_up", classes="icon--tiny") }}
</span> </span>
</template> </template>
</th> </th>
@ -63,7 +63,7 @@
<td> <td>
<a v-bind:href="taskOrder.url" class="icon-link view-task-order-link"> <a v-bind:href="taskOrder.url" class="icon-link view-task-order-link">
<span>View</span> <span>View</span>
{{ Icon("caret_right") }} {{ Icon("caret_right", classes="icon--tiny") }}
</a> </a>
</td> </td>
</tr> </tr>
@ -135,7 +135,7 @@
{% endif %} {% endif %}
{% if expired_task_orders %} {% if expired_task_orders %}
{{ TaskOrderList(expired_task_orders, label='', expired=True) }} {{ TaskOrderList(expired_task_orders, label='expired', expired=True) }}
{% endif %} {% endif %}
</div> </div>