From c7accbb25340a0473cd22f26ed358b030fa9f39f Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Mon, 1 Jul 2024 15:48:35 -0400
Subject: [PATCH] Tweaks

---
 src/registrar/assets/js/get-gov.js                  | 4 ++++
 src/registrar/assets/sass/_theme/_base.scss         | 8 ++++++++
 src/registrar/templates/includes/domains_table.html | 4 ++--
 src/registrar/templates/portfolio_domains.html      | 2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index b9c6e24eb..5365507a4 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -1331,6 +1331,10 @@ document.addEventListener('DOMContentLoaded', function() {
         checkbox.checked = false; 
       });
       hideElement(resetFiltersButton);
+
+      // Disable the auto scroll
+      scrollToTable = false;
+      
       loadDomains(1, 'id', 'asc');
       resetHeaders();
       updateStatusIndicator();
diff --git a/src/registrar/assets/sass/_theme/_base.scss b/src/registrar/assets/sass/_theme/_base.scss
index e9b457750..b2bad1edb 100644
--- a/src/registrar/assets/sass/_theme/_base.scss
+++ b/src/registrar/assets/sass/_theme/_base.scss
@@ -83,6 +83,10 @@ body {
   padding: 0 units(2) units(3);
   margin-top: units(3);
 
+  &.margin-top-0 {
+    margin-top: 0;
+  }
+
   h2 {
     color: color('primary-dark');
     margin-top: units(2);
@@ -96,6 +100,10 @@ body {
   @include at-media(mobile-lg) {
     margin-top: units(5);
 
+    &.margin-top-0 {
+      margin-top: 0;
+    }
+
     h2 {
       margin-bottom: 0;
     }
diff --git a/src/registrar/templates/includes/domains_table.html b/src/registrar/templates/includes/domains_table.html
index 18dec067a..b92819683 100644
--- a/src/registrar/templates/includes/domains_table.html
+++ b/src/registrar/templates/includes/domains_table.html
@@ -1,6 +1,6 @@
 {% load static %}
 
-<section class="section--outlined domains" id="domains">
+<section class="section--outlined domains{% if portfolio is not None %} margin-top-0{% endif %}" id="domains">
     <div class="grid-row">
       {% if portfolio is None %}
         <div class="mobile:grid-col-12 desktop:grid-col-6">
@@ -35,7 +35,7 @@
     </div>
     {% if portfolio %}
     <div class="display-flex flex-align-center margin-top-1"> 
-      <span class="margin-right-2 margin-top-neg-1 text-base">Filter by</span>
+      <span class="margin-right-2 margin-top-neg-1 text-base-darker">Filter by</span>
       <div class="usa-accordion usa-accordion--select margin-right-2">
         <div class="usa-accordion__heading">
           <button
diff --git a/src/registrar/templates/portfolio_domains.html b/src/registrar/templates/portfolio_domains.html
index 73acefdc5..4b5e1148b 100644
--- a/src/registrar/templates/portfolio_domains.html
+++ b/src/registrar/templates/portfolio_domains.html
@@ -3,6 +3,6 @@
 {% load static %}
 
 {% block portfolio_content %}
-    <h1 class="margin-bottom-neg-2" id="domains-header">Domains</h1>
+    <h1 id="domains-header">Domains</h1>
     {% include "includes/domains_table.html" with portfolio=portfolio %}
 {% endblock %}