0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-27 22:49:56 -05:00

Fixed conflicts

This commit is contained in:
Djordje Vlaisavljevic 2022-07-06 10:16:49 +02:00
parent d15fa439d1
commit 31cb31d5ad

View file

@ -1,7 +1,6 @@
import Frame from './Frame'; import Frame from './Frame';
import AppContext from '../AppContext'; import AppContext from '../AppContext';
import {ReactComponent as SearchIcon} from '../icons/search.svg'; import {ReactComponent as SearchIcon} from '../icons/search.svg';
import {ReactComponent as ClearIcon} from '../icons/delete.svg';
import {ReactComponent as CloseIcon} from '../icons/close.svg'; import {ReactComponent as CloseIcon} from '../icons/close.svg';
import {useContext} from 'react'; import {useContext} from 'react';
@ -126,7 +125,7 @@ class PopupContent extends React.Component {
function SearchBox() { function SearchBox() {
const {searchValue, dispatch} = useContext(AppContext); const {searchValue, dispatch} = useContext(AppContext);
return ( return (
<div className='flex items-center py-6 px-7 mt-10 md:mt-0'> <div className='flex items-center py-5 px-7 mt-10 md:mt-0'>
<SearchIcon className='mr-3 text-neutral-900' alt='Search' /> <SearchIcon className='mr-3 text-neutral-900' alt='Search' />
<input <input
autoFocus autoFocus