Skip to content

Commit f29f199

Browse files
committed
Update
1 parent 66c41e0 commit f29f199

File tree

4 files changed

+64
-11
lines changed

4 files changed

+64
-11
lines changed

sources/agreement/index.jsx

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,30 @@
11
import React from "react";
22
import "./style.scss";
3+
import { Breadcrumb, Card, Input, Select, Col, Row } from "antd";
34

45
export default class Agreement extends React.Component {
56
render() {
67
return (
78
<div id="agreement" className="animated fadeIn">
8-
<h1>Agreement</h1>
9+
<Row gutter={1}>
10+
<Col span={24}>
11+
<Card bordered={true}>
12+
<p>Card content</p>
13+
<p>Card content</p>
14+
<p>Card content</p>
15+
</Card>
16+
</Col>
17+
</Row>
18+
<Row gutter={1}>
19+
<Col span={24}>
20+
<Card bordered={false}>
21+
<p>Card content</p>
22+
<p>Card content</p>
23+
<p>Card content</p>
24+
</Card>
25+
</Col>
26+
</Row>
927
</div>
10-
)
28+
);
1129
}
1230
}

sources/agreement/style.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#setting {
1+
#agreement {
22

33
}

sources/dashboard/index.jsx

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,47 @@
11
import React from "react";
22
import "./style.scss";
3+
import { Breadcrumb, Card, Input, Select, Col, Row } from "antd";
4+
const Search = Input.Search;
5+
const InputGroup = Input.Group;
6+
const Option = Select.Option;
37

48
export default class Dashboard extends React.Component {
59
render() {
610
return (
711
<div id="dashboard" className="animated fadeIn">
8-
<h1>Dashboard</h1>
12+
<Card>
13+
<Breadcrumb>
14+
<Breadcrumb.Item>Home</Breadcrumb.Item>
15+
<Breadcrumb.Item>
16+
<a href="#/layout/dashboard">Dashboard</a>
17+
</Breadcrumb.Item>
18+
</Breadcrumb>
19+
</Card>
20+
<Row gutter={1}>
21+
<Col span={12}>
22+
<Card
23+
title="Status"
24+
bordered={false}
25+
extra={<a href="#">More</a>}
26+
>
27+
<p>Card content</p>
28+
<p>Card content</p>
29+
<p>Card content</p>
30+
</Card>
31+
</Col>
32+
<Col span={12}>
33+
<Card
34+
title="History"
35+
bordered={false}
36+
extra={<a href="#">More</a>}
37+
>
38+
<p>Card content</p>
39+
<p>Card content</p>
40+
<p>Card content</p>
41+
</Card>
42+
</Col>
43+
</Row>
944
</div>
10-
)
45+
);
1146
}
1247
}

sources/layout/style.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
@import "../common/styles/color.scss";
12
#layout {
23
height: 100%;
34
.left {
45
.logo {
5-
color: white;
6+
color: $color-white;
67
margin: auto 0;
78
line-height: 64px;
89
width: 100%;
@@ -13,7 +14,7 @@
1314
.right {
1415
overflow: hidden;
1516
.header {
16-
background: white;
17+
background: $color-white;
1718
padding: 0;
1819
.admin {
1920
float: right;
@@ -30,10 +31,9 @@
3031
}
3132
}
3233
.content {
33-
margin: 24px 16px;
34-
padding: 24px;
35-
background: white;
36-
min-height: 280px;
34+
// margin: 24px 16px;
35+
// padding: 24px;
36+
background: $color-border-light;
3737
}
3838
}
3939
}

0 commit comments

Comments
 (0)