zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-22 18:56:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'hotgov/2594-design-review' of https://github.com/cisagov/manage.get.gov into hotgov/2594-design-review

Browse source
This commit is contained in:
asaki222 2024-11-13 11:29:13 -05:00
commit 0973701838
No known key found for this signature in database
GPG key ID: 2C4F802060E06EA4
6 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/registrar/assets/sass/_theme/_base.scss
View file

@ -29,8 +29,8 @@ body {
padding-bottom: units(6) * 2 ; //Workaround because USWDS units jump from 10 to 15
}
#wrapper.wrapper--padding-top-4 {
padding-top: units(4);
#wrapper.wrapper--padding-top-6 {
padding-top: units(6);
}
#wrapper.dashboard {

5
src/registrar/context_processors.py
View file

@ -108,7 +108,8 @@ def is_widescreen_mode(request):
]
is_widescreen = any(path in request.path for path in widescreen_paths) or request.path == "/"
is_portfolio_widescreen = bool(
request.user.is_org_user(request) and
any(path in request.path for path in portfolio_widescreen_paths)
hasattr(request.user, "is_org_user")
and request.user.is_org_user(request)
and any(path in request.path for path in portfolio_widescreen_paths)
)
return {"is_widescreen_mode": is_widescreen or is_portfolio_widescreen}

2
src/registrar/templates/domain_request_done.html
View file

@ -7,7 +7,7 @@
{% comment %} Same as the old wrapper implementation but with padding-top-4 {% endcomment %}
{% block wrapperdiv %}
<div id="wrapper" class="wrapper--padding-top-4">
<div id="wrapper" class="wrapper--padding-top-6">
{% endblock wrapperdiv %}
{% block content %}

2
src/registrar/templates/domain_request_requesting_entity.html
View file

@ -2,7 +2,7 @@
{% load field_helpers url_helpers %}
{% block form_instructions %}
<p>To help with our review, we need to understand whether the domain you're requesting will be used by the Department of Energy or by one of its suborganizations.</p>
<p>To help with our review, we need to understand whether the domain you're requesting will be used by {{ portfolio }} or by one of its suborganizations.</p>
<p>We define a suborganization as any entity (agency, bureau, office) that falls under the overarching organization.</p>
{% endblock %}

2
src/registrar/templates/domain_request_withdraw_confirmation.html
View file

@ -4,7 +4,7 @@
{% load static url_helpers %}
{% block wrapperdiv %}
<div id="wrapper" class="wrapper--padding-top-4">
<div id="wrapper" class="wrapper--padding-top-6">
{% endblock wrapperdiv %}
{% block content %}

2
src/registrar/tests/test_views_portfolio.py
View file

@ -1658,7 +1658,7 @@ class TestRequestingEntity(WebTest):
self.assertContains(response, "Add suborganization information")
# We expect to see the portfolio name in two places:
# the header, and as one of the radio button options.
self.assertContains(response, self.portfolio.organization_name, count=2)
self.assertContains(response, self.portfolio.organization_name, count=3)
# We expect the dropdown list to contain the suborganizations that currently exist on this portfolio
self.assertContains(response, self.suborganization.name, count=1)