diff --git a/web/components/clear-search-button.react.js b/web/components/clear-search-button.react.js --- a/web/components/clear-search-button.react.js +++ b/web/components/clear-search-button.react.js @@ -1,6 +1,6 @@ // @flow -import { faTimes } from '@fortawesome/free-solid-svg-icons'; +import { faTimesCircle } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import classNames from 'classnames'; import * as React from 'react'; @@ -19,7 +19,7 @@ }); return ( ); } diff --git a/web/components/search.css b/web/components/search.css --- a/web/components/search.css +++ b/web/components/search.css @@ -3,24 +3,31 @@ display: flex; align-items: center; margin: 1rem; + border-radius: 16px; +} + +div.searchIcon { + display: flex; + margin: 0 11px; } input.searchInput { - background-color: var(--text-input-bg); - font-size: var(--s-font-14); - padding: 1rem; + background-color: transparent; + font-size: var(--m-font-16); + line-height: 1.5; + padding: 12px 0; flex: 1; border: none; - color: var(--text-input-color); + color: var(--search-input-color); outline: none; } input.searchInput::placeholder { - color: var(--text-input-placeholder); + color: var(--search-input-placeholder); } button.clearSearch { - color: var(--text-input-color); + color: var(--search-clear-color); transition: ease-in-out 0.15s; border: none; padding: 0 1rem; diff --git a/web/components/search.react.js b/web/components/search.react.js --- a/web/components/search.react.js +++ b/web/components/search.react.js @@ -2,6 +2,7 @@ import * as React from 'react'; +import SWMansionIcon from '../SWMansionIcon.react'; import ClearSearchButton from './clear-search-button.react'; import css from './search.css'; @@ -29,6 +30,9 @@ return (
+
+ +