From e392c97b65dafe8c6a3e67d9bae0b6b07aba09c7 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 13:57:10 -0400 Subject: [PATCH 1/7] Update h2 style --- scss/elements/_typography.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scss/elements/_typography.scss b/scss/elements/_typography.scss index e720402c..36fa6d64 100644 --- a/scss/elements/_typography.scss +++ b/scss/elements/_typography.scss @@ -22,10 +22,12 @@ h1, h2, h3, h4, h5, h6 { h1 { margin-top: 0.5em; + margin-bottom: 0; } h2 { margin-top: 0; + color: $color-gray; } a, From 56b850dfefddfc143eac9e547f049ffef30f7a0a Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Tue, 24 Jul 2018 11:07:27 -0400 Subject: [PATCH 2/7] Add max width to ul --- scss/elements/_typography.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scss/elements/_typography.scss b/scss/elements/_typography.scss index 36fa6d64..74f3b345 100644 --- a/scss/elements/_typography.scss +++ b/scss/elements/_typography.scss @@ -4,7 +4,7 @@ * @source https://github.com/uswds/uswds/blob/develop/src/stylesheets/elements/_typography.scss */ -* { + * { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } @@ -47,3 +47,7 @@ dt { display: inline; font-weight: bold; } + +ul { + max-width: 45em; +} \ No newline at end of file From 9af7dac1eed0cc54da8f366ae3b6245ac35a3002 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Tue, 24 Jul 2018 11:08:40 -0400 Subject: [PATCH 3/7] Revert "Add max width to ul" This reverts commit 56b850dfefddfc143eac9e547f049ffef30f7a0a. --- scss/elements/_typography.scss | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scss/elements/_typography.scss b/scss/elements/_typography.scss index 74f3b345..36fa6d64 100644 --- a/scss/elements/_typography.scss +++ b/scss/elements/_typography.scss @@ -4,7 +4,7 @@ * @source https://github.com/uswds/uswds/blob/develop/src/stylesheets/elements/_typography.scss */ - * { +* { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } @@ -47,7 +47,3 @@ dt { display: inline; font-weight: bold; } - -ul { - max-width: 45em; -} \ No newline at end of file From c0c74c7df2a949893caf850b40e67355450791f3 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Tue, 24 Jul 2018 13:30:26 -0400 Subject: [PATCH 4/7] Fix padding of placeholder text in example field --- templates/requests/screen-1.html.to | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/requests/screen-1.html.to b/templates/requests/screen-1.html.to index efbf57eb..e9cc5ca8 100644 --- a/templates/requests/screen-1.html.to +++ b/templates/requests/screen-1.html.to @@ -140,7 +140,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 }} From ef2041e87129cc6440d9c8d6f8bd1bdf58c8734d Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Tue, 24 Jul 2018 13:33:11 -0400 Subject: [PATCH 5/7] Clean up some copy of field inputs --- atst/forms/financial.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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()]) From 1503a519ed17f830160eaf89822bda8bb5ca851f Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Tue, 24 Jul 2018 14:18:04 -0400 Subject: [PATCH 6/7] Handle styles for a panel subtitle --- scss/elements/_panels.scss | 8 ++++++++ scss/elements/_typography.scss | 11 ++++++++++- templates/requests/screen-1.html.to | 5 ++++- templates/requests/screen-2.html.to | 6 ++++-- templates/requests/screen-3.html.to | 5 ++++- templates/requests/screen-4.html.to | 6 ++++-- templates/requests_new.html.to | 1 + 7 files changed, 35 insertions(+), 7 deletions(-) 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..e97b8216 100644 --- a/scss/elements/_typography.scss +++ b/scss/elements/_typography.scss @@ -4,7 +4,7 @@ * @source https://github.com/uswds/uswds/blob/develop/src/stylesheets/elements/_typography.scss */ -* { + * { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } @@ -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 e9cc5ca8..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 %} 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:

    diff --git a/templates/requests/screen-4.html.to b/templates/requests/screen-4.html.to index 22da27a0..048795e0 100644 --- a/templates/requests/screen-4.html.to +++ b/templates/requests/screen-4.html.to @@ -1,5 +1,9 @@ {% extends '../requests_new.html.to' %} +{% block subtitle %} +

    Review & Submit

    +{% end %} + {% block form_action %}
    {% end %} @@ -11,8 +15,6 @@ There were some errors, see below. {% end %} -

    Review & Submit

    -

    Before you can submit your request, please take a moment to review the information entered in the form. You may make changes by clicking the edit link on each section. When all information looks right, go ahead and submit.

    Details of Use Edit

    diff --git a/templates/requests_new.html.to b/templates/requests_new.html.to index 39a54f39..8cd9194a 100644 --- a/templates/requests_new.html.to +++ b/templates/requests_new.html.to @@ -11,6 +11,7 @@

    New Request

    +
    {% block subtitle %}{% end %}
    {% block form_action %} From 198e51c08573e5b3159ccd7b2133ab7f8ab8a7ba Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Tue, 24 Jul 2018 14:18:57 -0400 Subject: [PATCH 7/7] Fix indent --- scss/elements/_typography.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/elements/_typography.scss b/scss/elements/_typography.scss index e97b8216..57e310db 100644 --- a/scss/elements/_typography.scss +++ b/scss/elements/_typography.scss @@ -4,7 +4,7 @@ * @source https://github.com/uswds/uswds/blob/develop/src/stylesheets/elements/_typography.scss */ - * { +* { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; }