diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 02bd94e1f..13f9a48c0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -33,7 +33,7 @@ jobs: run: docker compose run app python manage.py test pa11y-scan: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 diff --git a/src/registrar/assets/img/registrar/favicons/favicon-128.png b/src/registrar/assets/img/registrar/favicons/favicon-128.png new file mode 100644 index 000000000..93bffce8e Binary files /dev/null and b/src/registrar/assets/img/registrar/favicons/favicon-128.png differ diff --git a/src/registrar/assets/img/registrar/favicons/favicon-180.png b/src/registrar/assets/img/registrar/favicons/favicon-180.png new file mode 100644 index 000000000..b1b28f1c3 Binary files /dev/null and b/src/registrar/assets/img/registrar/favicons/favicon-180.png differ diff --git a/src/registrar/assets/img/registrar/favicons/favicon-192.png b/src/registrar/assets/img/registrar/favicons/favicon-192.png new file mode 100644 index 000000000..002f7fb58 Binary files /dev/null and b/src/registrar/assets/img/registrar/favicons/favicon-192.png differ diff --git a/src/registrar/assets/img/registrar/favicons/favicon-32.png b/src/registrar/assets/img/registrar/favicons/favicon-32.png new file mode 100644 index 000000000..3026795a5 Binary files /dev/null and b/src/registrar/assets/img/registrar/favicons/favicon-32.png differ diff --git a/src/registrar/assets/img/registrar/favicons/favicon.ico b/src/registrar/assets/img/registrar/favicons/favicon.ico new file mode 100644 index 000000000..4b32b2cf2 Binary files /dev/null and b/src/registrar/assets/img/registrar/favicons/favicon.ico differ diff --git a/src/registrar/assets/img/registrar/favicons/favicon.svg b/src/registrar/assets/img/registrar/favicons/favicon.svg new file mode 100644 index 000000000..1b712b6c7 --- /dev/null +++ b/src/registrar/assets/img/registrar/favicons/favicon.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss b/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss index 135683df4..5f8c10cea 100644 --- a/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss +++ b/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss @@ -36,7 +36,9 @@ $letter-space--xs: .0125em; } .usa-logo { - margin-top: units(2); + @include at-media(desktop) { + margin-top: units(2); + } } .usa-logo__text { @@ -48,6 +50,13 @@ $letter-space--xs: .0125em; margin-top: units(1); } +p, +.usa-list li +{ + @include typeset('sans', 'sm', 5); + max-width: measure(5); +} + h1 { @include typeset('sans', '2xl', 2); margin: 0 0 units(2); @@ -90,13 +99,6 @@ $letter-space--xs: .0125em; } } -.register-form-step p, -.register-form-step .usa-list li, -.dashboard p -{ - @include typeset('sans', 'sm', 5); - max-width: measure(5); -} .register-form-step a { color: color('primary'); @@ -125,7 +127,7 @@ a.breadcrumb__back { color: color('primary'); } - @include at-media('desktop') { + @include at-media('tablet') { //align to top of sidebar margin-top: units(-0.5); } @@ -196,6 +198,18 @@ a.breadcrumb__back { margin-bottom: units(0.5); } +.usa-form .usa-button { + margin-top: units(3); +} + +.usa-button--unstyled .usa-icon { + vertical-align: bottom; +} + +a.usa-button--unstyled:visited { + color: color('primary'); +} + .dotgov-button--green { background-color: color('success-dark'); @@ -215,7 +229,7 @@ a.breadcrumb__back { padding-top: units(5); } -section.dashboard { +.section--outlined { background-color: color('white'); border: 1px solid color('base-lighter'); border-radius: 4px; @@ -223,6 +237,8 @@ section.dashboard { margin-top: units(3); h2 { + color: color('primary-dark'); + margin-top: units(2); margin-bottom: units(2); } @@ -234,11 +250,37 @@ section.dashboard { margin-top: units(5); h2 { - margin-bottom: units(3); + margin-bottom: 0; } } } +.dotgov-table--stacked { + td, th { + padding: units(1) units(2) units(2px) 0; + border: none; + } + + tr:first-child th:first-child { + border-top: none; + } + + tr { + border-bottom: none; + border-top: 2px solid color('base-light'); + margin-top: units(2); + + &:first-child { + margin-top: 0; + } + } + + td[data-label]:before, + th[data-label]:before { + color: color('primary-darker'); + padding-bottom: units(2px); + } +} .dotgov-table { width: 100%; @@ -262,38 +304,16 @@ section.dashboard { th[data-sortable]:not([aria-sort]) .usa-table__header__button { right: auto; } -} -.dotgov-table--stacked { - td, th { - padding: units(1) units(2) units(2px) 0; - border: none; - } + tbody th { + word-break: break-word; + } - tr:first-child th:first-child { - border-top: none; - } - tr { - border-bottom: none; - border-top: 2px solid color('base-light'); - margin-top: units(2); + @include at-media(mobile-lg) { - &:first-child { - margin-top: 0; - } - } + margin-top: units(1); - td[data-label]:before, - th[data-label]:before { - color: color('primary-darker'); - padding-bottom: units(2px); - } -} - -@include at-media(mobile-lg) { - - .dotgov-table { tr { border: none; } @@ -312,10 +332,6 @@ section.dashboard { border-bottom: 0; } } - - tbody th { - word-break: break-word; - } td, th, .usa-tabel th{ diff --git a/src/registrar/fixtures.py b/src/registrar/fixtures.py index 4f56a2336..09ebf2690 100644 --- a/src/registrar/fixtures.py +++ b/src/registrar/fixtures.py @@ -140,7 +140,13 @@ class DomainApplicationFixture: da.organization_type = ( app["organization_type"] if "organization_type" in app else "federal" ) - da.federal_agency = app["federal_agency"] if "federal_agency" in app else "" + da.federal_agency = ( + app["federal_agency"] + if "federal_agency" in app + # Random choice of agency for selects, used as placeholders for testing. + else random.choice(DomainApplication.AGENCIES) # nosec + ) + da.federal_type = ( app["federal_type"] if "federal_type" in app diff --git a/src/registrar/templates/application_dotgov_domain.html b/src/registrar/templates/application_dotgov_domain.html index a89ca8148..a6b9d1037 100644 --- a/src/registrar/templates/application_dotgov_domain.html +++ b/src/registrar/templates/application_dotgov_domain.html @@ -38,7 +38,8 @@
-

What .gov domain do you want? *

+

What .gov domain do you want? *

After you enter your domain, we’ll make sure it’s diff --git a/src/registrar/templates/application_form.html b/src/registrar/templates/application_form.html index 3697235f1..6830033b5 100644 --- a/src/registrar/templates/application_form.html +++ b/src/registrar/templates/application_form.html @@ -1,14 +1,14 @@ {% extends 'base.html' %} {% load static form_helpers url_helpers %} -{% block title %}Apply for a .gov domain – {{form_titles|get_item:steps.current}}{% endblock %} +{% block title %}Apply for a .gov domain | {{form_titles|get_item:steps.current}} | {% endblock %} {% block content %}

-
+
{% include 'application_sidebar.html' %}
-
+
{% if steps.prev %} diff --git a/src/registrar/templates/application_org_federal.html b/src/registrar/templates/application_org_federal.html index 5016e698a..28cabadd0 100644 --- a/src/registrar/templates/application_org_federal.html +++ b/src/registrar/templates/application_org_federal.html @@ -3,7 +3,7 @@ {% block form_instructions %}

- Which federal branch is your organization in? * + Which federal branch is your organization in? *

{% endblock %} diff --git a/src/registrar/templates/application_org_type.html b/src/registrar/templates/application_org_type.html index 8bea8986a..80d599920 100644 --- a/src/registrar/templates/application_org_type.html +++ b/src/registrar/templates/application_org_type.html @@ -3,7 +3,7 @@ {% block form_instructions %}

- What kind of U.S.-based government organization do you represent? * + What kind of U.S.-based government organization do you represent? *

{% endblock %} diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html index a864ac48d..f90ac2014 100644 --- a/src/registrar/templates/base.html +++ b/src/registrar/templates/base.html @@ -16,9 +16,21 @@ {% endblock %} {% block extra_meta %}{% endblock extra_meta %} - {# TO-DO: set defaults for these #} - - + + + + + {% block css %} @@ -128,9 +140,9 @@
{% block logo %} {% endblock %} diff --git a/src/registrar/templates/domain_base.html b/src/registrar/templates/domain_base.html index 494491190..ac1f8c7a9 100644 --- a/src/registrar/templates/domain_base.html +++ b/src/registrar/templates/domain_base.html @@ -1,30 +1,30 @@ {% extends "base.html" %} {% load static %} -{% block title %}Domain {{ domain.name }}{% endblock %} +{% block title %}Domain: {{ domain.name }} | {% endblock %} {% block content %}
-

- {{ domain.name }} + Domain name: {{ domain.name }}

-
+
{% include 'domain_sidebar.html' %}
-
+
-

+

Back to manage your domains

diff --git a/src/registrar/templates/domain_users.html b/src/registrar/templates/domain_users.html index f842cff6c..09d391dc8 100644 --- a/src/registrar/templates/domain_users.html +++ b/src/registrar/templates/domain_users.html @@ -1,35 +1,37 @@ {% extends "domain_base.html" %} {% load static %} -{% block title %}User management{% endblock %} +{% block title %}User management | {{ domain.name }} | {% endblock %} {% block domain_content %}

User management

{% if domain.permissions %} +
- - - - - - - - - {% for permission in domain.permissions.all %} - - - - - {% endfor %} - -
Domain users
EmailRole
- {{ permission.user.email }} - {{ permission.role|title }}
-
Active users + Domain users + + + Email + Role + + + + {% for permission in domain.permissions.all %} + + + {{ permission.user.email }} + + {{ permission.role|title }} + + {% endfor %} + + +
+ >
{% endif %} @@ -37,8 +39,10 @@ Add another user +
{% if domain.invitations.exists %} +

Invitations

@@ -66,6 +70,7 @@ {% endfor %}
Domain invitations
+
{% endif %} {% endblock %} {# domain_content #} diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html index 5d819772d..7d1801c0b 100644 --- a/src/registrar/templates/home.html +++ b/src/registrar/templates/home.html @@ -12,9 +12,13 @@

Manage your domains

-

Start a new domain request

+

+ + Start a new domain request + +

-
+

Registered domains

{% if domains %} @@ -37,7 +41,16 @@ @@ -53,7 +66,7 @@ {% endif %} -
+

Active domain requests

{% if domain_applications %}
{{ domain.application_status|title }} - Edit {{ domain.name }} + + Manage {{ domain.name }}
@@ -104,7 +117,7 @@

Start a new domain request

-
+

Archived domains

You don't have any archived domains

diff --git a/src/registrar/templates/includes/footer.html b/src/registrar/templates/includes/footer.html index 4b5f0efbc..5864a808c 100644 --- a/src/registrar/templates/includes/footer.html +++ b/src/registrar/templates/includes/footer.html @@ -49,7 +49,7 @@ src="{% static 'img/CISA_logo.png' %}" alt="CISA logo" role="img" - width="200px" + width="48px" />