#3698: Fix advanced search

NCI-Agency · Aug 11, 2021 · ae2f4f1 · ae2f4f1
1 parent f89e6bd
commit ae2f4f1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/client/src/components/AdvancedSearch.js b/client/src/components/AdvancedSearch.js
@@ -15,14 +15,7 @@ import _cloneDeep from "lodash/cloneDeep"
 import { Organization, Position } from "models"
 import PropTypes from "prop-types"
 import React, { useState } from "react"
-import {
-  Button,
-  Col,
-  Dropdown,
-  FormControl,
-  FormGroup,
-  Row
-} from "react-bootstrap"
+import { Button, Col, Dropdown, FormGroup, Row } from "react-bootstrap"
 import { connect } from "react-redux"
 import { useHistory } from "react-router-dom"
 import { POSITION_POSITION_TYPE_FILTER_KEY } from "searchUtils"
@@ -101,14 +94,15 @@ const AdvancedSearch = ({
       {() => (
         <div className="advanced-search form-horizontal">
           <Form onSubmit={onSubmit}>
-            <FormGroup>
+            <FormGroup style={{ marginBottom: "15px" }}>
               <ButtonGroupContainerS>
                 <ButtonToggleGroup
                   value={objectType}
                   onChange={changeObjectType}
                 >
                   {possibleFilterTypes.map(type => (
                     <Button
+                      variant="outline-secondary"
                       key={type}
                       value={type}
                       disabled={possibleFilterTypes.length < 2}
@@ -138,9 +132,13 @@ const AdvancedSearch = ({
               </ButtonGroupContainerS>
             </FormGroup>
 
-            <FormControl defaultValue={text} className="hidden" />
+            {/* FIXME: Seems like a reduntand input field. */}
+            {/* <FormControl defaultValue={text} className="hidden" /> */}
 
-            <div className="advanced-search-content">
+            <div
+              className="advanced-search-content"
+              style={{ paddingLeft: "15px" }}
+            >
               {filters.map(
                 filter =>
                   filterDefs[filter.key] && (

diff --git a/client/src/components/SearchBar.js b/client/src/components/SearchBar.js
@@ -101,8 +101,18 @@ const SearchBar = ({
             id="searchBarInput"
           />
           {!showAdvancedSearch && (
-            <Button onClick={onSubmit} id="searchBarSubmit">
-              <img src={SEARCH_ICON} height={16} alt="Search" />
+            <Button
+              onClick={onSubmit}
+              id="searchBarSubmit"
+              variant="outline-light"
+              style={{ borderColor: "#ced4da" }}
+            >
+              <img
+                src={SEARCH_ICON}
+                height={16}
+                alt="Search"
+                style={{ color: "white" }}
+              />
             </Button>
           )}
         </InputGroup>