diff --git a/atst/forms/financial.py b/atst/forms/financial.py index 77811ee1..d9c7ca14 100644 --- a/atst/forms/financial.py +++ b/atst/forms/financial.py @@ -47,9 +47,9 @@ class FinancialForm(ValidatedForm): "Program Element (PE) Number related to your request" ) - treasury_code = StringField("Please provide your Program Treasury Code") + treasury_code = StringField("Program Treasury Code") - ba_code = StringField("Please provide your Program BA Code") + ba_code = StringField("Program BA Code") fname_co = StringField("Contracting Officer First Name", validators=[Required()]) lname_co = StringField("Contracting Officer Last Name", validators=[Required()]) diff --git a/scss/elements/_panels.scss b/scss/elements/_panels.scss index e45ee1ec..ba88cd48 100644 --- a/scss/elements/_panels.scss +++ b/scss/elements/_panels.scss @@ -43,4 +43,12 @@ padding: 0 ($gap * 4); } } + + .panel__heading { + margin: ($gap * 2) 0; + + h1, h2, h3, h4, h5, h6 { + margin: 0; + } + } } \ No newline at end of file diff --git a/scss/elements/_typography.scss b/scss/elements/_typography.scss index facba32b..57e310db 100644 --- a/scss/elements/_typography.scss +++ b/scss/elements/_typography.scss @@ -17,6 +17,11 @@ p { h1, h2, h3, h4, h5, h6 { font-family: $font-sans; margin: ($gap * 2) 0; + + + .subtitle * { + margin-top: 0; + } + } a, @@ -36,3 +41,7 @@ dt { display: inline; font-weight: bold; } + +.subtitle { + color: $color-gray; +} diff --git a/templates/requests/screen-1.html.to b/templates/requests/screen-1.html.to index efbf57eb..61d94528 100644 --- a/templates/requests/screen-1.html.to +++ b/templates/requests/screen-1.html.to @@ -1,7 +1,10 @@ {% extends '../requests_new.html.to' %} +{% block subtitle %} +

Details of Use

+{% end %} + {% block form %} -

Details of Use

{% autoescape None %} {% if f.errors %} @@ -140,7 +143,7 @@
{{ f.supporting_organization.label }} - {{ f.supporting_organization(placeholder="Example: AF CCE/HNI, Navy SPAWAR, MITRE", class_="usa-unstyled-list") }} + {{ f.supporting_organization(placeholder="Example: AF CCE/HNI, Navy SPAWAR, MITRE") }} {% for e in f.supporting_organization.errors %}
{{ e }} diff --git a/templates/requests/screen-2.html.to b/templates/requests/screen-2.html.to index 951cfe6f..af1dbb74 100644 --- a/templates/requests/screen-2.html.to +++ b/templates/requests/screen-2.html.to @@ -1,5 +1,9 @@ {% extends '../requests_new.html.to' %} +{% block subtitle %} +

Information About You

+{% end %} + {% block form %} {% autoescape None %} @@ -7,8 +11,6 @@ There were some errors, see below. {% end %} - -

Information About You

Please tell us more about yourself.

{{ f.fname_request.label }} diff --git a/templates/requests/screen-3.html.to b/templates/requests/screen-3.html.to index 15c26b51..4dbeb3d4 100644 --- a/templates/requests/screen-3.html.to +++ b/templates/requests/screen-3.html.to @@ -1,5 +1,9 @@ {% extends '../requests_new.html.to' %} +{% block subtitle %} +

Primary Government/Military
Point of Contact (POC)

+{% end %} + {% block form %} {% autoescape None %} @@ -7,7 +11,6 @@ There were some errors, see below. {% end %} -

Primary Government/Military
Point of Contact (POC)

Please designate a Primary Point of Contact that will be responsible for owning the workspace in the JEDI Cloud.

The Point of Contact will become the primary owner of the workspace created to use the JEDI Cloud. As a workspace owner, this person will have the ability to: