From 8fd62ecaef7c95394102d654e24e5caf9e11c298 Mon Sep 17 00:00:00 2001
From: Simon Fessehaye <fessehay@ualberta.ca>
Date: Tue, 3 Aug 2021 14:27:27 -0600
Subject: [PATCH] 6527 Clean up _forms.scss

---
 source/js/components/join/join.scss           | 10 +++++++
 source/js/components/petition/petition.scss   | 26 +++++++++++++++++
 .../sass/mofo-bootstrap/mofo-bootstrap.scss   |  4 ---
 .../sass/mofo-bootstrap/overrides/_forms.scss | 29 -------------------
 source/sass/views/style-guide.scss            |  4 +++
 5 files changed, 40 insertions(+), 33 deletions(-)
 delete mode 100644 source/sass/mofo-bootstrap/overrides/_forms.scss

diff --git a/source/js/components/join/join.scss b/source/js/components/join/join.scss
index 14735e7cc64..bdcb36da794 100644
--- a/source/js/components/join/join.scss
+++ b/source/js/components/join/join.scss
@@ -13,9 +13,19 @@
     .form-control {
       padding-right: map-get($glyph-container, "margin-x") * 2 +
         map-get($glyph-container, "width");
+      border: 1px solid $danger;
 
       @at-root .dark-theme & {
         border-width: 2px;
+        border-color: $dark-theme-danger;
+      }
+    }
+
+    .form-control-feedback {
+      color: $danger;
+
+      @at-root .dark-theme & {
+        color: $dark-theme-danger;
       }
     }
 
diff --git a/source/js/components/petition/petition.scss b/source/js/components/petition/petition.scss
index 9d1537efd6e..603efd63a0f 100644
--- a/source/js/components/petition/petition.scss
+++ b/source/js/components/petition/petition.scss
@@ -77,3 +77,29 @@
     }
   }
 }
+
+.petition-form {
+  .form-check {
+    .form-control-feedback {
+      margin-left: -$form-check-input-gutter;
+    }
+  }
+
+  .has-danger {
+    .form-control-feedback {
+      color: $danger;
+
+      @at-root .dark-theme & {
+        color: $dark-theme-danger;
+      }
+    }
+
+    .form-control {
+      border: 1px solid $danger;
+
+      @at-root .dark-theme & {
+        border-color: $dark-theme-danger;
+      }
+    }
+  }
+}
diff --git a/source/sass/mofo-bootstrap/mofo-bootstrap.scss b/source/sass/mofo-bootstrap/mofo-bootstrap.scss
index d6951d952f5..a797f85ca54 100644
--- a/source/sass/mofo-bootstrap/mofo-bootstrap.scss
+++ b/source/sass/mofo-bootstrap/mofo-bootstrap.scss
@@ -36,7 +36,3 @@
 
 // Utility classes
 @import "../../../node_modules/bootstrap/scss/utilities";
-
-// Bootstrap overrides
-
-@import "./overrides/forms";
diff --git a/source/sass/mofo-bootstrap/overrides/_forms.scss b/source/sass/mofo-bootstrap/overrides/_forms.scss
deleted file mode 100644
index faabdc00110..00000000000
--- a/source/sass/mofo-bootstrap/overrides/_forms.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-// adding this Bootstrap v4.0.0-alpha.6 utility class back
-.has-danger {
-  .form-control-feedback,
-  .form-control-danger {
-    color: $danger;
-
-    @at-root .dark-theme & {
-      color: $dark-theme-danger;
-    }
-  }
-
-  .form-control {
-    border: 1px solid $danger;
-
-    @at-root .dark-theme & {
-      border-color: $dark-theme-danger;
-    }
-  }
-}
-
-.form-check {
-  .form-control-feedback {
-    margin-left: -$form-check-input-gutter;
-  }
-}
-
-.form-control-lg {
-  height: auto;
-}
diff --git a/source/sass/views/style-guide.scss b/source/sass/views/style-guide.scss
index e41355b37aa..ec3220ca777 100644
--- a/source/sass/views/style-guide.scss
+++ b/source/sass/views/style-guide.scss
@@ -15,3 +15,7 @@
 .color-code {
   color: $gray-60;
 }
+
+.form-control-lg {
+  height: auto;
+}