Skip to content

Commit

Permalink
All rebase fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Joozty committed Dec 15, 2020
1 parent 2b0631d commit 72ff695
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
5 changes: 1 addition & 4 deletions modules/search-layout/sidebar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ import { classNames } from '@oacore/design/lib/utils'
import styles from './styles.module.css'

const Sidebar = ({ children, className, ...restProps }) => (
<div
className={classNames.use(styles.sidebar, className)}
{...restProps}
>
<div className={classNames.use(styles.sidebar, className)} {...restProps}>
{children}
</div>
)
Expand Down
4 changes: 2 additions & 2 deletions pages/data-providers/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ const SearchPage = observe(({ initialState }) => {
)
const setQuery = useCallback(
(q) => {
dataProviders.params.query = q
dataProviders.params.q = q
},
[dataProviders.params.query]
[dataProviders.params.q]
)
const handleUrlChange = useCallback(
(event) => {
Expand Down
7 changes: 5 additions & 2 deletions templates/data-provider/styles.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,13 @@
margin-right: 0.5rem;
}

.card {
min-width: unset;
}

.card .map {
width: auto;
margin: calc(-1 * var(--card-padding-y)) calc(-1 * var(--card-padding-x))
var(--card-padding-x) calc(-1 * var(--card-padding-x));
margin: -1rem -1rem 1rem;
}

.no-results-find {
Expand Down

0 comments on commit 72ff695

Please sign in to comment.