zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-25 12:08:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into za/3103-prevent-errors-member-management

Browse source
This commit is contained in:
zandercymatics 2024-12-02 09:20:19 -07:00
commit f1d19a1bbc
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
7 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/registrar/assets/src/js/getgov/table-members.js
View file

@ -102,7 +102,7 @@ export class MembersTable extends BaseTable {
aria-label="Expand for additional information" aria-label="Expand for additional information"
> >
<span>Expand</span> <span>Expand</span>
<svg class="usa-icon usa-icon--big" aria-hidden="true" focusable="false" role="img" width="24"> <svg class="usa-icon usa-icon--large" aria-hidden="true" focusable="false" role="img" width="24">
<use xlink:href="/public/img/sprite.svg#expand_more"></use> <use xlink:href="/public/img/sprite.svg#expand_more"></use>
</svg> </svg>
</button> </button>

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

@ -253,4 +253,11 @@ abbr[title] {
.break-word { .break-word {
word-break: break-word; word-break: break-word;
}
//Icon size adjustment used by buttons and form errors
.usa-icon.usa-icon--large {
margin: 0;
height: 1.5em;
width: 1.5em;
} }

6
src/registrar/assets/src/sass/_theme/_buttons.scss
View file

@ -243,12 +243,6 @@ a .usa-icon,
width: 1.3em; width: 1.3em;
} }
.usa-icon.usa-icon--big {
margin: 0;
height: 1.5em;
width: 1.5em;
}
// Red, for delete buttons // Red, for delete buttons
// Used on: All delete buttons // Used on: All delete buttons
// Note: Can be simplified by adding text-secondary to delete anchors in tables // Note: Can be simplified by adding text-secondary to delete anchors in tables

2
src/registrar/templates/includes/domain_requests_table.html
View file

@ -55,7 +55,7 @@
<div class="section-outlined__utility-button mobile-lg:padding-right-105 {% if portfolio %} mobile:grid-col-12 desktop:grid-col-6 desktop:padding-left-3{% endif %}" id="export-csv"> <div class="section-outlined__utility-button mobile-lg:padding-right-105 {% if portfolio %} mobile:grid-col-12 desktop:grid-col-6 desktop:padding-left-3{% endif %}" id="export-csv">
<section aria-label="Domain Requests report component" class="margin-top-205"> <section aria-label="Domain Requests report component" class="margin-top-205">
<a href="{% url 'export_data_type_requests' %}" class="usa-button usa-button--unstyled usa-button--with-icon usa-button--justify-right" role="button"> <a href="{% url 'export_data_type_requests' %}" class="usa-button usa-button--unstyled usa-button--with-icon usa-button--justify-right" role="button">
<svg class="usa-icon usa-icon--big" aria-hidden="true" focusable="false" role="img" width="24" height="24"> <svg class="usa-icon usa-icon--large" aria-hidden="true" focusable="false" role="img" width="24" height="24">
<use xlink:href="{% static 'img/sprite.svg' %}#file_download"></use> <use xlink:href="{% static 'img/sprite.svg' %}#file_download"></use>
</svg>Export as CSV </svg>Export as CSV
</a> </a>

2
src/registrar/templates/includes/domains_table.html
View file

@ -45,7 +45,7 @@
<div class="section-outlined__utility-button mobile-lg:padding-right-105 {% if portfolio %} mobile:grid-col-12 desktop:grid-col-6 desktop:padding-left-3{% endif %}"> <div class="section-outlined__utility-button mobile-lg:padding-right-105 {% if portfolio %} mobile:grid-col-12 desktop:grid-col-6 desktop:padding-left-3{% endif %}">
<section aria-label="Domains report component" class="margin-top-205"> <section aria-label="Domains report component" class="margin-top-205">
<a href="{% url 'export_data_type_user' %}" class="usa-button usa-button--unstyled usa-button--with-icon usa-button--justify-right" role="button"> <a href="{% url 'export_data_type_user' %}" class="usa-button usa-button--unstyled usa-button--with-icon usa-button--justify-right" role="button">
<svg class="usa-icon usa-icon--big" aria-hidden="true" focusable="false" role="img" width="24" height="24"> <svg class="usa-icon usa-icon--large" aria-hidden="true" focusable="false" role="img" width="24" height="24">
<use xlink:href="{%static 'img/sprite.svg'%}#file_download"></use> <use xlink:href="{%static 'img/sprite.svg'%}#file_download"></use>
</svg>Export as CSV </svg>Export as CSV
</a> </a>

9
src/registrar/templates/includes/input_with_errors.html
View file

@ -52,9 +52,12 @@ error messages, if necessary.
{% if field.errors %} {% if field.errors %}
<div id="{{ widget.attrs.id }}__error-message"> <div id="{{ widget.attrs.id }}__error-message">
{% for error in field.errors %} {% for error in field.errors %}
<span class="usa-error-message" role="alert"> <div class="usa-error-message display-flex" role="alert">
{{ error }} <svg class="usa-icon usa-icon--large" focusable="true" role="img" aria-label="Error">
</span> <use xlink:href="{%static 'img/sprite.svg'%}#error"></use>
</svg>
<span class="margin-left-05">{{ error }}</span>
</div>
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}

2
src/registrar/templates/includes/members_table.html
View file

@ -39,7 +39,7 @@
<div class="section-outlined__utility-button mobile-lg:padding-right-105 {% if portfolio %} mobile:grid-col-12 desktop:grid-col-6 desktop:padding-left-3{% endif %}"> <div class="section-outlined__utility-button mobile-lg:padding-right-105 {% if portfolio %} mobile:grid-col-12 desktop:grid-col-6 desktop:padding-left-3{% endif %}">
<section aria-label="Domains report component" class="margin-top-205"> <section aria-label="Domains report component" class="margin-top-205">
<a href="{% url 'export_members_portfolio' %}" class="usa-button usa-button--unstyled usa-button--with-icon usa-button--justify-right" role="button"> <a href="{% url 'export_members_portfolio' %}" class="usa-button usa-button--unstyled usa-button--with-icon usa-button--justify-right" role="button">
<svg class="usa-icon usa-icon--big" aria-hidden="true" focusable="false" role="img" width="24" height="24"> <svg class="usa-icon usa-icon--large" aria-hidden="true" focusable="false" role="img" width="24" height="24">
<use xlink:href="{%static 'img/sprite.svg'%}#file_download"></use> <use xlink:href="{%static 'img/sprite.svg'%}#file_download"></use>
</svg>Export as CSV </svg>Export as CSV
</a> </a>