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

Merge pull request #644 from dod-ccpo/ko-review-styling

Browse Source 
KO Review styling
This commit is contained in:
montana-mil 2019-02-14 14:47:52 -05:00 committed by GitHub
commit 7d6ad6aeff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
styles/components/_forms.scss
View File

@ -77,6 +77,7 @@
.form__sub-fields { .form__sub-fields {
@include alert; @include alert;
@include alert-level('default'); @include alert-level('default');
margin-top: $gap * 2;
display: block; display: block;
.usa-input { .usa-input {

4
styles/elements/_panels.scss
View File

@ -68,6 +68,10 @@
} }
} }
.panel__body {
margin-right: $gap * 2;
}
.panel__heading { .panel__heading {
padding: $gap * 2; padding: $gap * 2;

3
styles/sections/_task_order.scss
View File

@ -281,9 +281,6 @@
} }
} }
.usa-input__title {
color: $color-gray;
}
.subheading, .description { .subheading, .description {
color: $color-gray; color: $color-gray;

2
templates/components/review_field.html
View File

@ -1,5 +1,5 @@
{% macro ReviewField(heading, field, filter=None) %} {% macro ReviewField(heading, field, filter=None) %}
<div class="col col--grow"> <div class="col col--grow panel__body">
<h4 class='task-order-form__heading'>{{ heading }}</h4> <h4 class='task-order-form__heading'>{{ heading }}</h4>
{% if field %} {% if field %}
<p>{{ field | findFilter(filter) }}</p> <p>{{ field | findFilter(filter) }}</p>

6
templates/fragments/task_order_review/reporting.html
View File

@ -21,6 +21,8 @@
}} }}
</div> </div>
<div class="row">
<div class="col col--grow panel__body">
<h4 class='task-order-form__heading'>{{ "task_orders.new.review.complexity"| translate }}</h4> <h4 class='task-order-form__heading'>{{ "task_orders.new.review.complexity"| translate }}</h4>
{% if task_order.complexity %} {% if task_order.complexity %}
<ul class="checklist"> <ul class="checklist">
@ -33,9 +35,11 @@
{% else %} {% else %}
<p>{{ RequiredLabel() }}</p> <p>{{ RequiredLabel() }}</p>
{% endif %} {% endif %}
</div>
</div>
<div class="row"> <div class="row">
<div class="col col--grow"> <div class="col col--grow panel__body">
<h4 class='task-order-form__heading'>{{ "task_orders.new.review.team"| translate }}</h4> <h4 class='task-order-form__heading'>{{ "task_orders.new.review.team"| translate }}</h4>
{% if task_order.dev_team %} {% if task_order.dev_team %}
<ul class="checklist"> <ul class="checklist">

6
templates/portfolios/task_orders/review.html
View File

@ -66,9 +66,9 @@
<div class="h2">{{ "task_orders.ko_review.task_order_information"| translate }}</div> <div class="h2">{{ "task_orders.ko_review.task_order_information"| translate }}</div>
<div class="form__sub-fields"> <div class="form__sub-fields">
{{ UploadInput(form.pdf) }} {{ UploadInput(form.pdf, show_label=True) }}
{{ TextInput(form.number) }} {{ TextInput(form.number, placeholder='1234567890') }}
{{ TextInput(form.loa) }} {{ TextInput(form.loa, placeholder='1234567890') }}
{{ TextInput(form.custom_clauses, paragraph=True) }} {{ TextInput(form.custom_clauses, paragraph=True) }}
</div> </div>

2
translations.yaml
View File

@ -62,7 +62,7 @@ forms:
pdf_label: Upload a copy of your Task Order document pdf_label: Upload a copy of your Task Order document
pdf_description: Upload a PDF of the Task Order that you entered in your system of record for your organization. pdf_description: Upload a PDF of the Task Order that you entered in your system of record for your organization.
to_number: Task Order Number to_number: Task Order Number
loa: Line of Accounting (LOA) #1 loa: Line of Accounting (LOA) &#35;1
custom_clauses_label: Task Order Custom Clauses (optional) custom_clauses_label: Task Order Custom Clauses (optional)
custom_clauses_description: This will put a pause on the CSP access once the KO signs until the CCPO reviews that language to make sure it is legal. custom_clauses_description: This will put a pause on the CSP access once the KO signs until the CCPO reviews that language to make sure it is legal.
edit_member: edit_member: