Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1ad8f67

Browse files
committed
Add Margin, use constants
1 parentc16f105 commit1ad8f67

File tree

6 files changed

+61
-18
lines changed

6 files changed

+61
-18
lines changed

‎site/src/components/FullPageForm/FullPageForm.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { makeStyles } from "@material-ui/core/styles"
22
importReactfrom"react"
33
import{FormCloseButton}from"../FormCloseButton/FormCloseButton"
44
import{FormTitle}from"../FormTitle/FormTitle"
5+
import{Margins}from"../Margins/Margins"
56

67
exportinterfaceFullPageFormProps{
78
title:string
@@ -11,7 +12,6 @@ export interface FullPageFormProps {
1112

1213
constuseStyles=makeStyles(()=>({
1314
root:{
14-
maxWidth:"1380px",
1515
width:"100%",
1616
display:"flex",
1717
flexDirection:"column",
@@ -23,10 +23,12 @@ export const FullPageForm: React.FC<FullPageFormProps> = ({ title, detail, onCan
2323
conststyles=useStyles()
2424
return(
2525
<mainclassName={styles.root}>
26-
<FormTitletitle={title}detail={detail}/>
27-
<FormCloseButtononClose={onCancel}/>
26+
<Margins>
27+
<FormTitletitle={title}detail={detail}/>
28+
<FormCloseButtononClose={onCancel}/>
2829

29-
{children}
30+
{children}
31+
</Margins>
3032
</main>
3133
)
3234
}

‎site/src/components/Header/Header.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import Box from "@material-ui/core/Box"
22
import{makeStyles}from"@material-ui/core/styles"
33
importTypographyfrom"@material-ui/core/Typography"
44
importReactfrom"react"
5+
import{maxWidth,sidePadding}from"../../theme/constants"
56
import{HeaderButton}from"../HeaderButton/HeaderButton"
67

78
exportinterfaceHeaderAction{
@@ -66,18 +67,19 @@ const useStyles = makeStyles((theme) => ({
6667
position:"relative",
6768
display:"flex",
6869
alignItems:"center",
69-
height:150,
70+
height:126,
7071
background:theme.palette.hero.main,
7172
boxShadow:theme.shadows[3],
7273
},
7374
topInner:{
7475
display:"flex",
7576
alignItems:"center",
76-
maxWidth:"1380px",
77+
maxWidth,
7778
margin:"0 auto",
7879
flex:1,
7980
height:68,
8081
minWidth:0,
82+
padding:`0${sidePadding}`
8183
},
8284
title:{
8385
display:"flex",
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import{action}from"@storybook/addon-actions"
2+
import{ComponentMeta,Story}from"@storybook/react"
3+
importReactfrom"react"
4+
import{Margins}from"./Margins"
5+
6+
exportdefault{
7+
title:"components/Margins",
8+
component:Margins,
9+
}asComponentMeta<typeofMargins>
10+
11+
constTemplate:Story=(args)=>(
12+
<Margins{...args}>
13+
<divstyle={{width:"100%",background:"lightgrey"}}>
14+
Here's some content that won't get too wide!
15+
</div>
16+
</Margins>
17+
)
18+
19+
exportconstExample=Template.bind({})
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import{makeStyles}from"@material-ui/core/styles"
2+
importReactfrom"react"
3+
import{maxWidth,sidePadding}from"../../theme/constants"
4+
5+
constuseStyles=makeStyles(()=>({
6+
margins:{
7+
margin:"0 auto",
8+
maxWidth,
9+
padding:`0${sidePadding}`,
10+
flex:1,
11+
}
12+
}))
13+
14+
exportconstMargins:React.FC=({ children})=>{
15+
conststyles=useStyles()
16+
return(
17+
<div>
18+
<divclassName={styles.margins}>
19+
{children}
20+
</div>
21+
</div>
22+
)
23+
}

‎site/src/pages/UsersPage/UsersPageView.tsx

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { makeStyles } from "@material-ui/core/styles"
22
importReactfrom"react"
33
import{Pager,UserResponse}from"../../api/types"
44
import{Header}from"../../components/Header/Header"
5+
import{Margins}from"../../components/Margins/Margins"
6+
import{Stack}from"../../components/Stack/Stack"
57
import{UsersTable}from"../../components/UsersTable/UsersTable"
68

79
exportconstLanguage={
@@ -17,23 +19,16 @@ export interface UsersPageViewProps {
1719
}
1820

1921
exportconstUsersPageView:React.FC<UsersPageViewProps>=({ users, pager, openUserCreationDialog})=>{
20-
conststyles=useStyles()
21-
2222
return(
23-
<divclassName={styles.flexColumn}>
23+
<Stackspacing={4}>
2424
<Header
2525
title={Language.pageTitle}
2626
subTitle={Language.pageSubtitle(pager)}
2727
action={{text:Language.newUserButton,onClick:openUserCreationDialog}}
2828
/>
29-
<UsersTableusers={users}/>
30-
</div>
29+
<Margins>
30+
<UsersTableusers={users}/>
31+
</Margins>
32+
</Stack>
3133
)
3234
}
33-
34-
constuseStyles=makeStyles(()=>({
35-
flexColumn:{
36-
display:"flex",
37-
flexDirection:"column",
38-
},
39-
}))

‎site/src/theme/constants.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ export const BODY_FONT_FAMILY = `"Inter", sans-serif`
77
exportconstlightButtonShadow="0 2px 2px rgba(0, 23, 121, 0.08)"
88
exportconstemptyBoxShadow="none"
99
exportconstnavHeight=56
10+
exportconstmaxWidth=1380
11+
exportconstsidePadding="50px"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp