diff --git a/src/registrar/assets/src/sass/_theme/_base.scss b/src/registrar/assets/src/sass/_theme/_base.scss index 9ca1355c3..1c0e9b124 100644 --- a/src/registrar/assets/src/sass/_theme/_base.scss +++ b/src/registrar/assets/src/sass/_theme/_base.scss @@ -99,9 +99,7 @@ body { } .section-outlined__search { flex-grow: 4; - // Align right max-width: 383px; - margin-left: auto; } } } diff --git a/src/registrar/templates/includes/domain_requests_table.html b/src/registrar/templates/includes/domain_requests_table.html index 8adc0929a..38f392f20 100644 --- a/src/registrar/templates/includes/domain_requests_table.html +++ b/src/registrar/templates/includes/domain_requests_table.html @@ -5,53 +5,17 @@
-
+
{% if not portfolio %}

Domain requests

{% else %} {% endif %} - - - + + {% with label_text=portfolio|yesno:"Search by domain name or creator,Search by domain name" item_id_prefix="domain-requests" aria_label_text="Domain requests search component" %} + {% include "includes/search_table.html" %} + {% endwith %}
{% if portfolio %} diff --git a/src/registrar/templates/includes/domains_table.html b/src/registrar/templates/includes/domains_table.html index 3cf04a830..e172a1065 100644 --- a/src/registrar/templates/includes/domains_table.html +++ b/src/registrar/templates/includes/domains_table.html @@ -26,54 +26,24 @@ {% endif %}
-
+
{% if not portfolio %}

Domains

{% else %} {% endif %} - + {% if user_domain_count and user_domain_count > 0 %} - + {% with label_text="Search by domain name" item_id_prefix="domains" aria_label_text="Domains search component" with_export="true" export_aria="Domains report component" export_url='export_data_type_user' %} + {% include "includes/search_table.html" %} + {% endwith %} + {% else %} + {% with label_text="Search by domain name" item_id_prefix="domains" aria_label_text="Domains search component"%} + {% include "includes/search_table.html" %} + {% endwith %} {% endif %}
- {% if num_expiring_domains > 0 and not portfolio %}
diff --git a/src/registrar/templates/includes/members_table.html b/src/registrar/templates/includes/members_table.html index be1715f30..d09e6de05 100644 --- a/src/registrar/templates/includes/members_table.html +++ b/src/registrar/templates/includes/members_table.html @@ -7,45 +7,11 @@
- - - -
+ + {% with label_text="Search by member name" item_id_prefix="members" aria_label_text="Members search component" with_export="true" export_aria="Members report component" export_url='export_members_portfolio'%} + {% include "includes/search_table.html" %} + {% endwith %} +