From edd7a9d7e3d1fea9783eb85c8b4a030ae981e952 Mon Sep 17 00:00:00 2001
From: SilviaAmAm <silvia@maykinmedia.nl>
Date: Fri, 21 Oct 2022 10:02:49 +0200
Subject: [PATCH] :ok_hand: [#1924] PR Feedback part 2

---
 src/openforms/js/components/form/textfield.js |  2 +-
 src/openforms/scss/admin/_app_overrides.scss  |  8 ++--
 .../scss/components/builder/_builder.scss     | 46 +++++++++----------
 src/openforms/scss/vendor/_rjsf-field.scss    |  5 --
 4 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/src/openforms/js/components/form/textfield.js b/src/openforms/js/components/form/textfield.js
index e771302b27..8851d24fdf 100644
--- a/src/openforms/js/components/form/textfield.js
+++ b/src/openforms/js/components/form/textfield.js
@@ -1,5 +1,5 @@
 import {Formio} from 'react-formio';
-
+import _ from 'lodash';
 import {DEFAULT_TEXT_TABS} from './edit/tabs';
 
 class TextField extends Formio.Components.components.textfield {
diff --git a/src/openforms/scss/admin/_app_overrides.scss b/src/openforms/scss/admin/_app_overrides.scss
index b380bb899a..150f9c41eb 100644
--- a/src/openforms/scss/admin/_app_overrides.scss
+++ b/src/openforms/scss/admin/_app_overrides.scss
@@ -211,16 +211,16 @@ $djai-border-width: 8px;
     }
 
     // re-apply django admin styles
-    background-color: buttonface;
-    border: 1px solid #ccc;
+    background-color: var(--form-input-bg);
+    border: 1px solid var(--border-color);
     border-radius: 4px;
     padding: 5px 6px;
     margin-top: 0;
 
     &:focus {
       color: inherit;
-      background-color: buttonface;
-      border-color: #999;
+      background-color: var(--form-input-bg);
+      border-color: var(--border-color);
       box-shadow: none;
       outline: initial;
     }
diff --git a/src/openforms/scss/components/builder/_builder.scss b/src/openforms/scss/components/builder/_builder.scss
index 48e1b28eab..c25cd56aa5 100644
--- a/src/openforms/scss/components/builder/_builder.scss
+++ b/src/openforms/scss/components/builder/_builder.scss
@@ -69,36 +69,34 @@ div.flatpickr-calendar.open {
   padding-top: 10px;
 }
 
-.choices__list {
-  &--dropdown {
-    background-color: var(--body-bg);
-    color: var(--body-fg);
-    border-color: var(--border-color);
-  }
+[ref='editForm'],
+[ref='component'] {
+  .choices__list {
+    &--dropdown {
+      background-color: var(--body-bg);
+      color: var(--body-fg);
+      border-color: var(--border-color);
+    }
 
-  .choices__input {
-    background-color: var(--form-input-bg);
-    border-color: var(--border-color);
-  }
+    .choices__input {
+      background-color: var(--form-input-bg);
+      border-color: var(--border-color);
+    }
 
-  .choices__input.choices__input--cloned {
-    background-color: var(--form-input-bg);
-    border-color: var(--border-color);
+    .choices__item--selectable.is-highlighted {
+      background-color: var(--formio-dropdown-highlighted-bg);
+    }
   }
 
-  .choices__item--selectable.is-highlighted {
-    background-color: var(--formio-dropdown-highlighted-bg);
+  .choices__list + .choices__input {
+    border: none;
+    border-radius: unset;
+    padding: 4px 0 4px 2px;
   }
-}
 
-.choices__list + .choices__input {
-  border: none;
-  border-radius: unset;
-  padding: 4px 0 4px 2px;
-}
-
-.choices__list:not(:empty) + .choices__input {
-  width: 1ch;
+  .choices__list:not(:empty) + .choices__input {
+    width: 1ch;
+  }
 }
 
 .builder-sidebar_scroll {
diff --git a/src/openforms/scss/vendor/_rjsf-field.scss b/src/openforms/scss/vendor/_rjsf-field.scss
index ca090eddfb..ed2901f812 100644
--- a/src/openforms/scss/vendor/_rjsf-field.scss
+++ b/src/openforms/scss/vendor/_rjsf-field.scss
@@ -25,11 +25,6 @@
     input[type='email'] {
       width: $input-field-size; // override from admin/rjsf default
     }
-
-    select {
-      background-color: var(--form-input-bg) !important;
-      border-color: var(--border-color) !important;
-    }
   }
 
   &__errors {