Merge branch 'jb/theme/space' into jb/theme/mod-space-literal

static/app/components/events/breadcrumbs/breadcrumbsTimeline.tsx

@@ -143,6 +143,7 @@ const Subtitle = styled('p')`
 
 const Timestamp = styled('div')`
   margin-right: ${p => p.theme.space(1)};
+  text-align: right;
   color: ${p => p.theme.subText};
   font-size: ${p => p.theme.fontSizeSmall};
   span {

static/app/components/timeline/index.tsx

@@ -62,12 +62,11 @@ const Row = styled('div')<{showLastLine?: boolean}>`
   position: relative;
   color: ${p => p.theme.subText};
   align-items: start;
-  grid-template: auto auto / 22px 1fr auto;
-  grid-column-gap: ${p => p.theme.space(1)};
-  margin: ${p => p.theme.space(1)} 0;
-  &:first-child {
-    margin-top: 0;
-  }
+  display: grid;
+  grid-template-columns: subgrid;
+  grid-column: 1/-1;
+  grid-row-gap: ${p => p.theme.space(0.5)};
+
   &:last-child {
     /* Show/hide connecting line from the last element of the timeline */
     background: ${p => (p.showLastLine ? 'transparent' : p.theme.background)};
@@ -135,8 +134,8 @@ export const Container = styled('div')`
   position: relative;
   display: grid;
   grid-template: auto auto / 22px 1fr auto;
-  grid-row-gap: ${space(1)};
-  grid-column-gap: ${space(1)};
+  grid-row-gap: ${p => p.theme.space(1)};
+  grid-column-gap: ${p => p.theme.space(1)};
   /* vertical line connecting items */
   &::before {
     content: '';

static/app/views/organizationStats/index.tsx

@@ -22,7 +22,11 @@ import {DATA_CATEGORY_INFO, DEFAULT_STATS_PERIOD} from 'sentry/constants';
 import {ALL_ACCESS_PROJECTS} from 'sentry/constants/pageFilters';
 import {t, tct} from 'sentry/locale';
 import ConfigStore from 'sentry/stores/configStore';
-import type {DataCategoryInfo, PageFilters} from 'sentry/types/core';
+import {
+  DataCategoryExact,
+  type DataCategoryInfo,
+  type PageFilters,
+} from 'sentry/types/core';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 import withOrganization from 'sentry/utils/withOrganization';