pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #652 from dod-ccpo/to-list-side-scroll

Browse Source 
Fix side scroll on TO List
This commit is contained in:
leigh-mil 2019-02-15 14:21:08 -05:00 committed by GitHub
commit e969c393fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
styles/components/_portfolio_layout.scss
View File

@ -370,12 +370,23 @@
} }
.to-performance-period { .to-performance-period {
&.to-expiring-soon { display: flex;
flex-wrap: wrap;
.to-end-date {
margin-right: 1.2rem;
}
&.to-expiring-soon {
.to-expiration-alert { .to-expiration-alert {
font-weight: $font-bold; font-weight: $font-bold;
font-size: 1.5rem; font-size: 1.5rem;
margin-left: $gap; word-break: normal;
white-space: normal;
.icon {
margin-left: 0;
}
} }
&.funded .to-expiration-alert { &.funded .to-expiration-alert {

4
templates/portfolios/task_orders/index.html
View File

@ -45,7 +45,7 @@
<td> <td>
<span class='label label--{{ label }}'>!{ taskOrder.display_status }</span> <span class='label label--{{ label }}'>!{ taskOrder.display_status }</span>
</td> </td>
<td class='table-cell--grow'> <td>
<span :class="{ 'to-performance-period': true, 'to-expiring-soon': (taskOrder.days_to_expiration > 0 && taskOrder.days_to_expiration <= days_to_exp_alert_limit), 'funded': funded && taskOrder.display_status === 'Active', 'unfunded': !funded && taskOrder.display_status === 'Active' }"> <span :class="{ 'to-performance-period': true, 'to-expiring-soon': (taskOrder.days_to_expiration > 0 && taskOrder.days_to_expiration <= days_to_exp_alert_limit), 'funded': funded && taskOrder.display_status === 'Active', 'unfunded': !funded && taskOrder.display_status === 'Active' }">
<local-datetime <local-datetime
v-bind:timestamp="taskOrder.start_date" v-bind:timestamp="taskOrder.start_date"
@ -66,7 +66,7 @@
<span <span
v-if="taskOrder.days_to_expiration > 0 && taskOrder.days_to_expiration <= days_to_exp_alert_limit && !funded" v-if="taskOrder.days_to_expiration > 0 && taskOrder.days_to_expiration <= days_to_exp_alert_limit && !funded"
class="to-expiration-alert"> class="to-expiration-alert">
{{ Icon('alert') }} Period ends in !{ taskOrder.days_to_expiration } days, submit a new task order<br> {{ Icon('alert') }} Period ends in !{ taskOrder.days_to_expiration } days, submit a new task order
</span> </span>
</span> </span>
</td> </td>