From ae975ed9f8812ecb27fac7d87ca1c6d96f1110f9 Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Mon, 25 Nov 2024 19:46:53 -0700
Subject: [PATCH 1/6] Updated all error messages to have error icon

---
 .../templates/includes/input_with_errors.html         | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/registrar/templates/includes/input_with_errors.html b/src/registrar/templates/includes/input_with_errors.html
index d1e53968e..98328612c 100644
--- a/src/registrar/templates/includes/input_with_errors.html
+++ b/src/registrar/templates/includes/input_with_errors.html
@@ -52,9 +52,14 @@ error messages, if necessary.
   {% if field.errors %}
     <div id="{{ widget.attrs.id }}__error-message">
     {% for error in field.errors %}
-      <span class="usa-error-message" role="alert">
-        {{ error }}
-      </span>
+      <div class="usa-error-message display-flex" role="alert">
+        <div class="margin-top-05">
+          <svg class="usa-icon" focusable="true" role="img" aria-label="Error" width="24" height="24">
+            <use xlink:href="{%static 'img/sprite.svg'%}#error"></use>
+          </svg>
+        </div>
+        <span class="margin-left-05">{{ error }}</span>
+      </div>
     {% endfor %}
     </div>
   {% endif %}

From 14071d00b6c5a104d5e851214a5d719e904a0365 Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Tue, 26 Nov 2024 14:26:37 -0700
Subject: [PATCH 2/6] icon size change

---
 src/registrar/assets/sass/_theme/_alerts.scss           | 5 +++++
 src/registrar/templates/includes/input_with_errors.html | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/registrar/assets/sass/_theme/_alerts.scss b/src/registrar/assets/sass/_theme/_alerts.scss
index 3cfa768fe..bd3eb9454 100644
--- a/src/registrar/assets/sass/_theme/_alerts.scss
+++ b/src/registrar/assets/sass/_theme/_alerts.scss
@@ -51,3 +51,8 @@
 .usa-site-alert--hot-pink .usa-alert .usa-alert__body::before {
   background-image: url('../img/usa-icons-bg/error.svg');
 }
+
+.usa-icon-large {
+  width: 1.5em;
+  height: 1.5em;
+}
\ No newline at end of file
diff --git a/src/registrar/templates/includes/input_with_errors.html b/src/registrar/templates/includes/input_with_errors.html
index 98328612c..9025ea0b4 100644
--- a/src/registrar/templates/includes/input_with_errors.html
+++ b/src/registrar/templates/includes/input_with_errors.html
@@ -54,7 +54,7 @@ error messages, if necessary.
     {% for error in field.errors %}
       <div class="usa-error-message display-flex" role="alert">
         <div class="margin-top-05">
-          <svg class="usa-icon" focusable="true" role="img" aria-label="Error" width="24" height="24">
+          <svg class="usa-icon usa-icon-large" focusable="true" role="img" aria-label="Error">
             <use xlink:href="{%static 'img/sprite.svg'%}#error"></use>
           </svg>
         </div>

From 754a652a97a45f4821d2fdbc1e32415745ceb5e6 Mon Sep 17 00:00:00 2001
From: CuriousX <nicolle.leclair@gmail.com>
Date: Fri, 29 Nov 2024 11:35:35 -0700
Subject: [PATCH 3/6] Update
 src/registrar/templates/includes/input_with_errors.html

Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
---
 src/registrar/templates/includes/input_with_errors.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/includes/input_with_errors.html b/src/registrar/templates/includes/input_with_errors.html
index 9025ea0b4..42188bd5b 100644
--- a/src/registrar/templates/includes/input_with_errors.html
+++ b/src/registrar/templates/includes/input_with_errors.html
@@ -53,7 +53,7 @@ error messages, if necessary.
     <div id="{{ widget.attrs.id }}__error-message">
     {% for error in field.errors %}
       <div class="usa-error-message display-flex" role="alert">
-        <div class="margin-top-05">
+        <div>
           <svg class="usa-icon usa-icon-large" focusable="true" role="img" aria-label="Error">
             <use xlink:href="{%static 'img/sprite.svg'%}#error"></use>
           </svg>

From 291bf7465030067789310403b2cf3b251956d6b4 Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Fri, 29 Nov 2024 11:53:01 -0700
Subject: [PATCH 4/6] Merge remnant?

---
 .../assets/src/sass/_theme/_alerts.scss       | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 src/registrar/assets/src/sass/_theme/_alerts.scss

diff --git a/src/registrar/assets/src/sass/_theme/_alerts.scss b/src/registrar/assets/src/sass/_theme/_alerts.scss
new file mode 100644
index 000000000..9579cc057
--- /dev/null
+++ b/src/registrar/assets/src/sass/_theme/_alerts.scss
@@ -0,0 +1,49 @@
+@use "uswds-core" as *;
+@use "base" as *;
+
+// Fixes some font size disparities with the Figma
+// for usa-alert alert elements
+.usa-alert {
+  .usa-alert__heading.larger-font-sizing {
+    font-size: units(3);
+  }
+}
+
+.usa-alert__text.measure-none {
+  max-width: measure(none);
+}
+
+// The icon was off center for some reason
+// Fixes that issue
+@media (min-width: 64em){
+  .usa-alert--warning{
+    .usa-alert__body::before {
+      left: 1rem !important;
+    }
+  }
+  .usa-alert__body.margin-left-1 {
+    margin-left: 0.5rem!important;
+  }
+}
+
+// NOTE: !important is used because _font.scss overrides this
+.usa-alert__body--widescreen {
+  max-width: $widescreen-max-width !important;
+}
+
+.usa-site-alert--hot-pink {
+  .usa-alert {
+    background-color: $hot-pink;
+    border-left-color: $hot-pink;
+    .usa-alert__body {
+      color: color('base-darkest');
+      background-color: $hot-pink;
+    }
+  }
+}
+
+@supports ((-webkit-mask:url()) or (mask:url())) {
+  .usa-site-alert--hot-pink .usa-alert .usa-alert__body::before {
+    background-color: color('base-darkest');
+  }
+}

From ac125f22f2e805b6a143f559fbc07e3d5c17ea44 Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Fri, 29 Nov 2024 11:53:07 -0700
Subject: [PATCH 5/6] scss cleanup

---
 .../assets/{ => src}/sass/_theme/_base.scss       | 15 +++++++++++----
 .../assets/{ => src}/sass/_theme/_buttons.scss    |  6 ------
 2 files changed, 11 insertions(+), 10 deletions(-)
 rename src/registrar/assets/{ => src}/sass/_theme/_base.scss (96%)
 rename src/registrar/assets/{ => src}/sass/_theme/_buttons.scss (98%)

diff --git a/src/registrar/assets/sass/_theme/_base.scss b/src/registrar/assets/src/sass/_theme/_base.scss
similarity index 96%
rename from src/registrar/assets/sass/_theme/_base.scss
rename to src/registrar/assets/src/sass/_theme/_base.scss
index db1599621..8d475270b 100644
--- a/src/registrar/assets/sass/_theme/_base.scss
+++ b/src/registrar/assets/src/sass/_theme/_base.scss
@@ -30,15 +30,15 @@ body {
   padding-bottom: units(6) * 2 ; //Workaround because USWDS units jump from 10 to 15
 }
 
+#wrapper.wrapper--padding-top-6 {
+  padding-top: units(6);
+}
+
 #wrapper.dashboard {
   background-color: color('primary-lightest');
   padding-top: units(5)!important;
 }
 
-#wrapper.dashboard--portfolio {
-  padding-top: units(4)!important;
-}
-
 #wrapper.dashboard--grey-1 {
   background-color: color('gray-1');
 }
@@ -254,3 +254,10 @@ abbr[title] {
 .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;
+}
\ No newline at end of file
diff --git a/src/registrar/assets/sass/_theme/_buttons.scss b/src/registrar/assets/src/sass/_theme/_buttons.scss
similarity index 98%
rename from src/registrar/assets/sass/_theme/_buttons.scss
rename to src/registrar/assets/src/sass/_theme/_buttons.scss
index c58242fe7..3342f5f7d 100644
--- a/src/registrar/assets/sass/_theme/_buttons.scss
+++ b/src/registrar/assets/src/sass/_theme/_buttons.scss
@@ -243,12 +243,6 @@ a .usa-icon,
   width: 1.3em;
 }
 
-.usa-icon.usa-icon--big {
-  margin: 0;
-  height: 1.5em;
-  width: 1.5em;
-}
-
 // Red, for delete buttons
 // Used on: All delete buttons
 // Note: Can be simplified by adding text-secondary to delete anchors in tables

From 62ec595ce4713755fce97733d7eebd070d9614d4 Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Fri, 29 Nov 2024 14:38:07 -0700
Subject: [PATCH 6/6] cleanup

---
 src/registrar/assets/sass/_theme/_alerts.scss | 53 -------------------
 .../templates/includes/input_with_errors.html |  8 ++-
 2 files changed, 3 insertions(+), 58 deletions(-)
 delete mode 100644 src/registrar/assets/sass/_theme/_alerts.scss

diff --git a/src/registrar/assets/sass/_theme/_alerts.scss b/src/registrar/assets/sass/_theme/_alerts.scss
deleted file mode 100644
index 3cfa768fe..000000000
--- a/src/registrar/assets/sass/_theme/_alerts.scss
+++ /dev/null
@@ -1,53 +0,0 @@
-@use "uswds-core" as *;
-@use "base" as *;
-
-// Fixes some font size disparities with the Figma
-// for usa-alert alert elements
-.usa-alert {
-  .usa-alert__heading.larger-font-sizing {
-    font-size: units(3);
-  }
-}
-
-.usa-alert__text.measure-none {
-  max-width: measure(none);
-}
-
-// The icon was off center for some reason
-// Fixes that issue
-@media (min-width: 64em){
-  .usa-alert--warning{
-    .usa-alert__body::before {
-      left: 1rem !important;
-    }
-  }
-  .usa-alert__body.margin-left-1 {
-    margin-left: 0.5rem!important;
-  }
-}
-
-// NOTE: !important is used because _font.scss overrides this
-.usa-alert__body--widescreen {
-  max-width: $widescreen-max-width !important;
-}
-
-.usa-site-alert--hot-pink {
-  .usa-alert {
-    background-color: $hot-pink;
-    border-left-color: $hot-pink;
-    .usa-alert__body {
-      color: color('base-darkest');
-      background-color: $hot-pink;
-    }
-  }
-}
-
-@supports ((-webkit-mask:url()) or (mask:url())) {
-  .usa-site-alert--hot-pink .usa-alert .usa-alert__body::before {
-    background-color: color('base-darkest');
-  }
-}
-
-.usa-site-alert--hot-pink .usa-alert .usa-alert__body::before {
-  background-image: url('../img/usa-icons-bg/error.svg');
-}
diff --git a/src/registrar/templates/includes/input_with_errors.html b/src/registrar/templates/includes/input_with_errors.html
index f55c9d19d..31900ac57 100644
--- a/src/registrar/templates/includes/input_with_errors.html
+++ b/src/registrar/templates/includes/input_with_errors.html
@@ -53,11 +53,9 @@ error messages, if necessary.
     <div id="{{ widget.attrs.id }}__error-message">
     {% for error in field.errors %}
       <div class="usa-error-message display-flex" role="alert">
-        <div>
-          <svg class="usa-icon usa-icon--large" focusable="true" role="img" aria-label="Error">
-            <use xlink:href="{%static 'img/sprite.svg'%}#error"></use>
-          </svg>
-        </div>
+        <svg class="usa-icon usa-icon--large" focusable="true" role="img" aria-label="Error">
+          <use xlink:href="{%static 'img/sprite.svg'%}#error"></use>
+        </svg>
         <span class="margin-left-05">{{ error }}</span>
       </div>
     {% endfor %}