File tree Expand file tree Collapse file tree 4 files changed +23
-23
lines changed Expand file tree Collapse file tree 4 files changed +23
-23
lines changed Original file line number Diff line number Diff line change @@ -32,8 +32,13 @@ export const PageHeaderTitle: React.FC<React.PropsWithChildren<unknown>> = ({ ch
32
32
return < h1 className = { styles . title } > { children } </ h1 >
33
33
}
34
34
35
- export const PageHeaderSubtitle : React . FC < React . PropsWithChildren < unknown > > = ( { children } ) => {
36
- const styles = useStyles ( )
35
+ export const PageHeaderSubtitle : React . FC < React . PropsWithChildren < { condensed ?: boolean } > > = ( {
36
+ children,
37
+ condensed,
38
+ } ) => {
39
+ const styles = useStyles ( {
40
+ condensed,
41
+ } )
37
42
38
43
return < h2 className = { styles . subtitle } > { children } </ h2 >
39
44
}
@@ -52,21 +57,21 @@ const useStyles = makeStyles((theme) => ({
52
57
} ,
53
58
54
59
title : {
55
- fontSize : theme . spacing ( 4 ) ,
56
- fontWeight : 400 ,
60
+ fontSize : theme . spacing ( 3 ) ,
57
61
margin : 0 ,
58
62
display : "flex" ,
59
63
alignItems : "center" ,
60
64
lineHeight : "140%" ,
61
65
} ,
62
66
63
67
subtitle : {
64
- fontSize : theme . spacing ( 2.25 ) ,
68
+ fontSize : theme . spacing ( 2 ) ,
65
69
color : theme . palette . text . secondary ,
66
70
fontWeight : 400 ,
67
71
display : "block" ,
68
72
margin : 0 ,
69
- marginTop : theme . spacing ( 1 ) ,
73
+ marginTop : ( { condensed } : { condensed ?: boolean } ) =>
74
+ condensed ? theme . spacing ( 0.5 ) : theme . spacing ( 1 ) ,
70
75
} ,
71
76
72
77
actions : {
Original file line number Diff line number Diff line change 1
- import Box from "@material-ui/core/Box"
2
1
import { makeStyles } from "@material-ui/core/styles"
3
2
import { ErrorSummary } from "components/ErrorSummary/ErrorSummary"
4
3
import { WorkspaceStatusBadge } from "components/WorkspaceStatusBadge/WorkspaceStatusBadge"
@@ -106,15 +105,15 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
106
105
}
107
106
>
108
107
< WorkspaceStatusBadge build = { workspace . latest_build } className = { styles . statusBadge } />
109
- < Box display = "flex ">
108
+ < Stack direction = "row" spacing = { 3 } alignItems = "center ">
110
109
{ hasTemplateIcon && (
111
110
< img alt = "" src = { workspace . template_icon } className = { styles . templateIcon } />
112
111
) }
113
112
< div >
114
113
< PageHeaderTitle > { workspace . name } </ PageHeaderTitle >
115
- < PageHeaderSubtitle > { workspace . owner_name } </ PageHeaderSubtitle >
114
+ < PageHeaderSubtitle condensed > { workspace . owner_name } </ PageHeaderSubtitle >
116
115
</ div >
117
- </ Box >
116
+ </ Stack >
118
117
</ PageHeader >
119
118
120
119
< Stack direction = "column" className = { styles . firstColumnSpacer } spacing = { 2.5 } >
@@ -184,10 +183,8 @@ export const useStyles = makeStyles((theme) => {
184
183
} ,
185
184
186
185
templateIcon : {
187
- width : 40 ,
188
- height : 40 ,
189
- marginRight : theme . spacing ( 2 ) ,
190
- marginTop : theme . spacing ( 0.5 ) ,
186
+ width : theme . spacing ( 6 ) ,
187
+ height : theme . spacing ( 6 ) ,
191
188
} ,
192
189
193
190
timelineContents : {
Original file line number Diff line number Diff line change @@ -130,7 +130,7 @@ export const TemplatePageView: FC<React.PropsWithChildren<TemplatePageViewProps>
130
130
</ div >
131
131
< div >
132
132
< PageHeaderTitle > { template . name } </ PageHeaderTitle >
133
- < PageHeaderSubtitle >
133
+ < PageHeaderSubtitle condensed >
134
134
{ template . description === "" ? Language . noDescription : template . description }
135
135
</ PageHeaderSubtitle >
136
136
</ div >
Original file line number Diff line number Diff line change @@ -70,14 +70,12 @@ export const UsersPageView: FC<React.PropsWithChildren<UsersPageViewProps>> = ({
70
70
< PageHeaderTitle > { Language . pageTitle } </ PageHeaderTitle >
71
71
</ PageHeader >
72
72
73
- < div style = { { marginTop : "15px" } } >
74
- < SearchBarWithFilter
75
- filter = { filter }
76
- onFilter = { onFilter }
77
- presetFilters = { presetFilters }
78
- error = { error }
79
- />
80
- </ div >
73
+ < SearchBarWithFilter
74
+ filter = { filter }
75
+ onFilter = { onFilter }
76
+ presetFilters = { presetFilters }
77
+ error = { error }
78
+ />
81
79
82
80
< UsersTable
83
81
users = { users }
You can’t perform that action at this time.
0 commit comments