From e632b96314403af77a8a8e5e6d07eee99e2d0059 Mon Sep 17 00:00:00 2001
From: Kyle Huynh <kyle.huynh205@gmail.com>
Date: Thu, 9 Feb 2023 16:13:53 -0500
Subject: [PATCH] Remove theme wrapper to avoid redudent

---
 css/advanced_search.form.css    | 4 ++++
 src/Form/AdvancedSearchForm.php | 9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/css/advanced_search.form.css b/css/advanced_search.form.css
index 1381f3d..aa0bfab 100644
--- a/css/advanced_search.form.css
+++ b/css/advanced_search.form.css
@@ -35,3 +35,7 @@ input.islandora-advanced-search-form__reset,
 input.islandora-advanced-search-form__search {
   display: inline-block;
 }
+
+.form-wrapper select {
+  margin-bottom: 1.125rem;
+}
\ No newline at end of file
diff --git a/src/Form/AdvancedSearchForm.php b/src/Form/AdvancedSearchForm.php
index 4ab24b2..372c2c0 100644
--- a/src/Form/AdvancedSearchForm.php
+++ b/src/Form/AdvancedSearchForm.php
@@ -297,6 +297,7 @@ class AdvancedSearchForm extends FormBase {
             self::OR_OP => $this->t('or'),
           ],
           '#default_value' => $conjunction,
+          '#theme_wrappers' => []
         ],
         self::SEARCH_FORM_FIELD => [
           '#type' => 'select',
@@ -305,6 +306,7 @@ class AdvancedSearchForm extends FormBase {
           ],
           '#options' => $options,
           '#default_value' => $term_value[self::SEARCH_FORM_FIELD],
+          '#theme_wrappers' => []
         ],
         self::INCLUDE_FORM_FIELD => [
           '#type' => 'select',
@@ -323,6 +325,7 @@ class AdvancedSearchForm extends FormBase {
               ':input[name="terms[' . $i . '][' . self::CONJUNCTION_FORM_FIELD . ']"]' => ['value' => self::AND_OP],
             ],
           ],
+          '#theme_wrappers' => []
         ],
         // Just markup to show when 'include' is not alterable due to the
         // selected 'conjunction'. Hide for the first term.
@@ -334,9 +337,10 @@ class AdvancedSearchForm extends FormBase {
               ':input[name="terms[' . $i . '][' . self::CONJUNCTION_FORM_FIELD . ']"]' => ['value' => self::OR_OP],
             ],
           ],
-          'content' => [
+          /*'content' => [
             '#markup' => $this->t('is'),
-          ],
+          ],*/
+          '#theme_wrappers' => []
         ],
         self::VALUE_FORM_FIELD => [
           '#type' => 'textfield',
@@ -344,6 +348,7 @@ class AdvancedSearchForm extends FormBase {
             'aria-label' => $this->t("Enter a search term")
           ],
           '#default_value' => $term_value[self::VALUE_FORM_FIELD],
+          '#theme_wrappers' => []
         ],
         'actions' => [
           '#type' => 'container',