Merge pull request #7167 from mozilla/6527-forms

6527 Clean up _forms.scss
MozillaFoundation · Aug 4, 2021 · 4644ecd · 4644ecd
2 parents 3794bc8 + b72315d
commit 4644ecd
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 33 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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;
+}