|
1 | 1 | import {useMemo} from 'react'; |
2 | | -import styled from '@emotion/styled'; |
3 | 2 | import type {Location} from 'history'; |
4 | 3 | import omit from 'lodash/omit'; |
5 | 4 |
|
6 | 5 | import {LinkButton} from '@sentry/scraps/button'; |
7 | 6 | import {CompactSelect} from '@sentry/scraps/compactSelect'; |
| 7 | +import {Grid} from '@sentry/scraps/layout'; |
8 | 8 | import {OverlayTrigger} from '@sentry/scraps/overlayTrigger'; |
9 | 9 |
|
10 | 10 | import * as Layout from 'sentry/components/layouts/thirds'; |
@@ -169,21 +169,19 @@ function FilterBar(props: FilterBarProps) { |
169 | 169 | const datePageFilterProps = useDatePageFilterProps(maxPickableDays); |
170 | 170 |
|
171 | 171 | return ( |
172 | | - <FilterActions> |
| 172 | + <Grid gap="xl" marginBottom="xl" columns={{sm: 'auto 1fr auto auto'}}> |
173 | 173 | <PageFilterBar condensed> |
174 | 174 | <EnvironmentPageFilter /> |
175 | 175 | <DatePageFilter {...datePageFilterProps} /> |
176 | 176 | </PageFilterBar> |
177 | | - <StyledSearchBarWrapper> |
178 | | - <SearchBar |
179 | | - projects={projectIds ?? []} |
180 | | - initialQuery={query} |
181 | | - onSearch={handleSearch} |
182 | | - /> |
183 | | - </StyledSearchBarWrapper> |
| 177 | + <SearchBar |
| 178 | + projects={projectIds ?? []} |
| 179 | + initialQuery={query} |
| 180 | + onSearch={handleSearch} |
| 181 | + /> |
184 | 182 | <PercentileSelect {...props} /> |
185 | 183 | <OpenInExploreButton {...props} /> |
186 | | - </FilterActions> |
| 184 | + </Grid> |
187 | 185 | ); |
188 | 186 | } |
189 | 187 |
|
@@ -286,23 +284,6 @@ function OpenInExploreButton({ |
286 | 284 | return <LinkButton to={exploreUrl}>{t('Open in Explore')}</LinkButton>; |
287 | 285 | } |
288 | 286 |
|
289 | | -const FilterActions = styled('div')` |
290 | | - display: grid; |
291 | | - gap: ${p => p.theme.space.xl}; |
292 | | - margin-bottom: ${p => p.theme.space.xl}; |
293 | | -
|
294 | | - @media (min-width: ${p => p.theme.breakpoints.sm}) { |
295 | | - grid-template-columns: auto 1fr auto auto; |
296 | | - } |
297 | | -`; |
298 | | - |
299 | | -const StyledSearchBarWrapper = styled('div')` |
300 | | - @media (min-width: ${p => p.theme.breakpoints.xl}) { |
301 | | - order: initial; |
302 | | - grid-column: auto; |
303 | | - } |
304 | | -`; |
305 | | - |
306 | 287 | function useMaxDuration( |
307 | 288 | transactionName: string, |
308 | 289 | pageFilters: PageFilters, |
|
0 commit comments