File tree Expand file tree Collapse file tree 8 files changed +36
-55
lines changed
views/integrationPipeline Expand file tree Collapse file tree 8 files changed +36
-55
lines changed Original file line number Diff line number Diff line change @@ -10,6 +10,7 @@ import {IconCellSignal} from 'sentry/components/badge/iconCellSignal';
10
10
import { Tag } from 'sentry/components/core/badge/tag' ;
11
11
import { Button } from 'sentry/components/core/button' ;
12
12
import { LinkButton } from 'sentry/components/core/button/linkButton' ;
13
+ import { Flex } from 'sentry/components/core/layout' ;
13
14
import { Tooltip } from 'sentry/components/core/tooltip' ;
14
15
import type { MenuItemProps } from 'sentry/components/dropdownMenu' ;
15
16
import { DropdownMenu } from 'sentry/components/dropdownMenu' ;
@@ -193,9 +194,9 @@ export function GroupPriorityDropdown({
193
194
< DropdownMenu
194
195
size = "sm"
195
196
menuTitle = {
196
- < MenuTitleContainer >
197
+ < Flex align = "end" justify = "between" >
197
198
< div > { t ( 'Set Priority' ) } </ div >
198
- </ MenuTitleContainer >
199
+ </ Flex >
199
200
}
200
201
minMenuWidth = { 230 }
201
202
trigger = { ( triggerProps , isOpen ) => (
@@ -269,12 +270,6 @@ const InlinePlaceholder = styled(Placeholder)`
269
270
vertical-align: middle;
270
271
` ;
271
272
272
- const MenuTitleContainer = styled ( 'div' ) `
273
- display: flex;
274
- align-items: flex-end;
275
- justify-content: space-between;
276
- ` ;
277
-
278
273
const StyledFooter = styled ( DropdownMenuFooter ) `
279
274
max-width: 230px;
280
275
${ p => p . theme . overflowEllipsis } ;
Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ import styled from '@emotion/styled';
4
4
import { Button } from 'sentry/components/core/button' ;
5
5
import type { SelectOption , SingleSelectProps } from 'sentry/components/core/compactSelect' ;
6
6
import { CompactSelect } from 'sentry/components/core/compactSelect' ;
7
+ import { Flex } from 'sentry/components/core/layout' ;
7
8
import DropdownButton from 'sentry/components/dropdownButton' ;
8
9
import HookOrDefault from 'sentry/components/hookOrDefault' ;
9
10
import { DesyncedFilterIndicator } from 'sentry/components/organizations/pageFilters/desyncedFilter' ;
@@ -451,7 +452,7 @@ export function TimeRangeSelector({
451
452
< FooterWrap >
452
453
< FooterInnerWrap > { menuFooter as React . ReactNode } </ FooterInnerWrap >
453
454
{ showAbsoluteSelector && (
454
- < AbsoluteSelectorFooter >
455
+ < Flex gap = "md" justify = "end" >
455
456
{ showRelative && (
456
457
< Button
457
458
size = "xs"
@@ -473,7 +474,7 @@ export function TimeRangeSelector({
473
474
>
474
475
{ t ( 'Apply' ) }
475
476
</ Button >
476
- </ AbsoluteSelectorFooter >
477
+ </ Flex >
477
478
) }
478
479
</ FooterWrap >
479
480
</ Fragment >
@@ -520,12 +521,6 @@ const StyledDateRangeHook = styled(DateRangeHook)`
520
521
width: max-content;
521
522
` ;
522
523
523
- const AbsoluteSelectorFooter = styled ( 'div' ) `
524
- display: flex;
525
- gap: ${ space ( 1 ) } ;
526
- justify-content: flex-end;
527
- ` ;
528
-
529
524
const FooterMessage = styled ( 'p' ) `
530
525
padding: ${ space ( 0.75 ) } ${ space ( 1 ) } ;
531
526
margin: ${ space ( 0.5 ) } 0;
Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ import {PlatformIcon} from 'platformicons';
4
4
import { hasEveryAccess } from 'sentry/components/acl/access' ;
5
5
import { CodeSnippet } from 'sentry/components/codeSnippet' ;
6
6
import { Button } from 'sentry/components/core/button' ;
7
+ import { Flex } from 'sentry/components/core/layout' ;
7
8
import { Link } from 'sentry/components/core/link' ;
8
9
import { createFilter } from 'sentry/components/forms/controls/reactSelectWrapper' ;
9
10
import type { Field } from 'sentry/components/forms/types' ;
@@ -44,10 +45,6 @@ const ORG_DISABLED_REASON = t(
44
45
"This option is enforced by your organization's settings and cannot be customized per-project."
45
46
) ;
46
47
47
- const PlatformWrapper = styled ( 'div' ) `
48
- display: flex;
49
- align-items: center;
50
- ` ;
51
48
const StyledPlatformIcon = styled ( PlatformIcon ) `
52
49
margin-right: ${ space ( 1 ) } ;
53
50
` ;
@@ -82,10 +79,10 @@ export const fields = {
82
79
options : platforms . map ( ( { id, name} ) => ( {
83
80
value : id ,
84
81
label : (
85
- < PlatformWrapper key = { id } >
82
+ < Flex align = "center" key = { id } >
86
83
< StyledPlatformIcon platform = { id } />
87
84
{ name }
88
- </ PlatformWrapper >
85
+ </ Flex >
89
86
) ,
90
87
} ) ) ,
91
88
help : t ( 'The primary platform for this project' ) ,
Original file line number Diff line number Diff line change 1
1
import { css } from '@emotion/react' ;
2
- import styled from '@emotion/styled' ;
3
2
import isEqual from 'lodash/isEqual' ;
4
3
5
4
import { Alert } from 'sentry/components/core/alert' ;
6
5
import { LinkButton } from 'sentry/components/core/button/linkButton' ;
6
+ import { Flex } from 'sentry/components/core/layout' ;
7
7
import Form from 'sentry/components/deprecatedforms/form' ;
8
8
import FormState from 'sentry/components/forms/state' ;
9
9
import LoadingIndicator from 'sentry/components/loadingIndicator' ;
@@ -223,7 +223,7 @@ class PluginSettings<
223
223
onSubmit = { this . onSubmit }
224
224
submitDisabled = { isSaving || ! hasChanges }
225
225
>
226
- < Flex >
226
+ < Flex direction = "column" >
227
227
{ this . state . errors . __all__ && (
228
228
< Alert type = "error" showIcon = { false } >
229
229
< ul >
@@ -245,9 +245,4 @@ class PluginSettings<
245
245
}
246
246
}
247
247
248
- const Flex = styled ( 'div' ) `
249
- display: flex;
250
- flex-direction: column;
251
- ` ;
252
-
253
248
export default PluginSettings ;
Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ import styled from '@emotion/styled';
4
4
5
5
import { Button } from 'sentry/components/core/button' ;
6
6
import { InputGroup } from 'sentry/components/core/input/inputGroup' ;
7
+ import { Flex } from 'sentry/components/core/layout' ;
7
8
import { Tooltip } from 'sentry/components/core/tooltip' ;
8
9
import { IconChevron } from 'sentry/icons' ;
9
10
import { IconSearch } from 'sentry/icons/iconSearch' ;
@@ -109,7 +110,7 @@ function StoryDefinitionFilePath(props: {node: PropTreeNode}) {
109
110
< Fragment >
110
111
< tr >
111
112
< StoryTypesTableDefinitionCell colSpan = { 2 } >
112
- < StoryTypesTableDefinitionCellContent >
113
+ < Flex align = "center" >
113
114
< Button
114
115
borderless
115
116
icon = { < IconChevron direction = { expanded ? 'down' : 'right' } /> }
@@ -122,7 +123,7 @@ function StoryDefinitionFilePath(props: {node: PropTreeNode}) {
122
123
/> { ' ' }
123
124
< span > { props . node . prop . parent ?. name } </ span > (
124
125
{ stripNodeModulesPrefix ( props . node . prop . definitionFilePath ) } )
125
- </ StoryTypesTableDefinitionCellContent >
126
+ </ Flex >
126
127
</ StoryTypesTableDefinitionCell >
127
128
</ tr >
128
129
{ expanded ? (
@@ -412,11 +413,6 @@ const StoryTypesTableDefinitionCell = styled('td')`
412
413
}
413
414
` ;
414
415
415
- const StoryTypesTableDefinitionCellContent = styled ( 'div' ) `
416
- display: flex;
417
- align-items: center;
418
- ` ;
419
-
420
416
const StoryType = styled ( 'div' ) `
421
417
font-family: ${ p => p . theme . text . familyMono } ;
422
418
` ;
Original file line number Diff line number Diff line change 1
1
import styled from '@emotion/styled' ;
2
2
3
3
import NegativeSpaceContainer from 'sentry/components/container/negativeSpaceContainer' ;
4
+ import { Flex } from 'sentry/components/core/layout' ;
4
5
import { space } from 'sentry/styles/space' ;
5
6
6
- export const SideBySide = styled ( 'div' ) < { vertical ?: boolean } > `
7
- display: flex;
8
- gap: ${ space ( 2 ) } ;
9
- flex-wrap: wrap;
10
- align-items: flex-start;
11
- flex-direction: ${ p => ( p . vertical ? 'column' : 'row' ) } ;
12
- ` ;
7
+ export const SideBySide = styled (
8
+ ( props : { children : React . ReactNode ; vertical ?: boolean } ) => {
9
+ return (
10
+ < Flex
11
+ gap = "xl"
12
+ align = "start"
13
+ wrap = "wrap"
14
+ direction = { props . vertical ? 'column' : 'row' }
15
+ >
16
+ { props . children }
17
+ </ Flex >
18
+ ) ;
19
+ }
20
+ ) `` ;
13
21
14
22
export const Grid = styled ( 'div' ) < { columns ?: number } > `
15
23
display: grid;
Original file line number Diff line number Diff line change 1
1
import styled from '@emotion/styled' ;
2
2
3
+ import { Flex } from 'sentry/components/core/layout' ;
3
4
import { Link } from 'sentry/components/core/link' ;
4
5
import { DateTime } from 'sentry/components/dateTime' ;
5
6
import ShortId , { StyledAutoSelectText } from 'sentry/components/shortId' ;
@@ -68,7 +69,6 @@ export const UserIcon = styled(IconUser)`
68
69
color: ${ p => p . theme . gray400 } ;
69
70
` ;
70
71
71
- export const IconContainer = styled ( 'div' ) `
72
- display: flex;
73
- gap: ${ p => p . theme . space . md } ;
74
- ` ;
72
+ export const IconContainer = styled ( ( props : { children : React . ReactNode } ) => {
73
+ return < Flex gap = "md" > { props . children } </ Flex > ;
74
+ } ) `` ;
Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ import {Button} from 'sentry/components/core/button';
9
9
import { LinkButton } from 'sentry/components/core/button/linkButton' ;
10
10
import type { SelectKey , SelectOption } from 'sentry/components/core/compactSelect' ;
11
11
import { CompactSelect } from 'sentry/components/core/compactSelect' ;
12
+ import { Flex } from 'sentry/components/core/layout' ;
12
13
import HookOrDefault from 'sentry/components/hookOrDefault' ;
13
14
import { IconAdd , IconLightning } from 'sentry/icons' ;
14
15
import { t } from 'sentry/locale' ;
@@ -107,7 +108,7 @@ export function GithubInstallationSelect({
107
108
value : installation . installation_id ,
108
109
textValue : installation . github_account ,
109
110
label : (
110
- < OptionLabelWrapper >
111
+ < Flex align = "center" gap = "md" >
111
112
{ installation . installation_id === '-1' ? (
112
113
< IconAdd />
113
114
) : (
@@ -122,7 +123,7 @@ export function GithubInstallationSelect({
122
123
{ ! doesntRequireUpgrade ( installation . installation_id ) && (
123
124
< IconLightning size = "xs" />
124
125
) }
125
- </ OptionLabelWrapper >
126
+ </ Flex >
126
127
) ,
127
128
} )
128
129
) ;
@@ -219,12 +220,6 @@ const StyledHeader = styled('h3')`
219
220
width: 100%;
220
221
` ;
221
222
222
- const OptionLabelWrapper = styled ( 'div' ) `
223
- display: flex;
224
- align-items: center;
225
- gap: ${ space ( 1 ) } ;
226
- ` ;
227
-
228
223
const StyledAvatar = styled ( BaseAvatar ) `
229
224
flex-shrink: 0;
230
225
` ;
You can’t perform that action at this time.
0 commit comments