Skip to content

Commit 11553a2

Browse files
committed
Dashboard css fixed
1 parent 91ebd69 commit 11553a2

File tree

9 files changed

+41
-40
lines changed

9 files changed

+41
-40
lines changed
Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,51 @@
11
.trigger {
2-
font-size: 18px;
3-
line-height: 64px;
4-
padding: 0 24px;
5-
cursor: pointer;
6-
transition: color 0.3s;
2+
font-size: 18px;
3+
line-height: 64px;
4+
padding: 0 24px;
5+
cursor: pointer;
6+
transition: color 0.3s;
77
}
88

99
.trigger:hover {
10-
color: #1890ff;
10+
color: #1890ff;
1111
}
1212

1313
.logo {
14-
height: 32px;
15-
background: rgba(255, 255, 255, 0.2);
16-
margin: 16px;
14+
height: 32px;
15+
background: rgba(255, 255, 255, 0.2);
16+
margin: 16px;
1717
}
1818

1919
/* Let's get this party started */
2020
::-webkit-scrollbar {
21-
width: 12px;
21+
width: 12px;
2222
}
2323

2424
/* Track */
2525
::-webkit-scrollbar-track {
26-
-webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.3);
27-
-webkit-border-radius: 10px;
28-
border-radius: 10px;
26+
-webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.3);
27+
-webkit-border-radius: 10px;
28+
border-radius: 10px;
2929
}
3030

3131
/* Handle */
3232
::-webkit-scrollbar-thumb {
33-
-webkit-border-radius: 10px;
34-
border-radius: 10px;
35-
background: #455A64;
36-
-webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.5);
33+
-webkit-border-radius: 10px;
34+
border-radius: 10px;
35+
background: #455a64;
36+
-webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.5);
3737
}
3838

3939
::-webkit-scrollbar-thumb:window-inactive {
40-
background: #455A64;
40+
background: #455a64;
4141
}
4242

4343
.sidebar {
44-
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 3px 10px 30px 3px rgba(0, 0, 0, 0.19);
45-
}
44+
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 3px 10px 30px 3px rgba(0, 0, 0, 0.19);
45+
}
46+
47+
.header-container {
48+
-webkit-box-shadow: 0px 6px 50px -18px rgba(0, 0, 0, 0.81);
49+
-moz-box-shadow: 0px 6px 50px -18px rgba(0, 0, 0, 0.81);
50+
box-shadow: 0px 6px 50px -18px rgba(0, 0, 0, 0.81);
51+
}

reactjs/src/components/Header/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { Col, Icon, Avatar, Menu, Dropdown, Badge } from 'antd';
2+
import { Col, Icon, Avatar, Menu, Dropdown, Badge, Row } from 'antd';
33
import { Link } from 'react-router-dom';
44
import LanguageSelect from '../LanguageSelect';
55
import './index.less';
@@ -24,7 +24,7 @@ const userDropdownMenu = (
2424
export class Header extends React.Component<IHeaderProps> {
2525
render() {
2626
return (
27-
<React.Fragment>
27+
<Row className={'header-container'}>
2828
<Col style={{ textAlign: 'left' }} span={12}>
2929
<Icon className="trigger" type={this.props.collapsed ? 'menu-unfold' : 'menu-fold'} onClick={this.props.toggle} />
3030
</Col>
@@ -36,7 +36,7 @@ export class Header extends React.Component<IHeaderProps> {
3636
</Badge>
3737
</Dropdown>
3838
</Col>
39-
</React.Fragment>
39+
</Row>
4040
);
4141
}
4242
}

reactjs/src/components/Layout/AppLayout.less

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,18 @@
3232
::-webkit-scrollbar-thumb {
3333
-webkit-border-radius: 10px;
3434
border-radius: 10px;
35-
background: #455A64;
35+
background: #455a64;
3636
-webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.5);
3737
}
3838

3939
::-webkit-scrollbar-thumb:window-inactive {
40-
background: #455A64;
40+
background: #455a64;
4141
}
4242

4343
.sidebar {
4444
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 3px 10px 30px 3px rgba(0, 0, 0, 0.19);
45-
}
45+
}
46+
47+
.TableCardContainer {
48+
margin: 25px 0px 0px 0px;
49+
}

reactjs/src/components/Layout/AppLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class AppLayout extends React.Component<any> {
4343
<Layout.Header style={{ background: '#fff', minHeight: 52, padding: 0 }}>
4444
<Header collapsed={this.state.collapsed} toggle={this.toggle} />
4545
</Layout.Header>
46-
<Content style={{ margin: '0 16px' }}>
46+
<Content style={{ margin: 16 }}>
4747
<Switch>
4848
{appRouters
4949
.filter((item: any) => !item.isLayout)

reactjs/src/scenes/Dashboard/index.less

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
.dashboardCard {
2-
margin-top: 16px;
3-
}
4-
51
.dasboardCard-task {
62
background-color: #e91e63;
73
border-radius: 5px;

reactjs/src/scenes/Dashboard/index.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,10 @@ export class Dashboard extends React.Component<any> {
112112
</Col>
113113
</Row>
114114

115-
<Row gutter={16}>
116-
<Col className={'dashboardBox'}>
117-
<Card title="Visit Statistics" loading={lineChartLoading} bordered={false}>
118-
<LineChartExample />
119-
</Card>
120-
</Col>
115+
<Row>
116+
<Card className={'dashboardBox'} title="Visit Statistics" loading={lineChartLoading} bordered={false}>
117+
<LineChartExample />
118+
</Card>
121119
</Row>
122120

123121
<Row gutter={16}>

reactjs/src/scenes/Roles/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { Card, Col, Row, Button, Table, Dropdown, Menu, Modal } from 'antd';
2-
import 'antd/dist/antd.css';
32
import * as React from 'react';
43
import { EntityDto } from 'src/services/dto/entityDto';
54
import CreateOrUpdateRole from './components/createOrUpdateRole';

reactjs/src/scenes/Tenants/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { Card, Col, Row, Button, Table, Tag, Dropdown, Menu, Modal } from 'antd';
2-
import 'antd/dist/antd.css';
32
import * as React from 'react';
43
import { EntityDto } from 'src/services/dto/entityDto';
54
import CreateOrUpdateTenant from './components/createOrUpdateTenant';

reactjs/src/scenes/Users/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { Card, Col, Row, Button, Table, Tag, Dropdown, Menu, Modal } from 'antd';
2-
import 'antd/dist/antd.css';
32
import * as React from 'react';
43
import CreateOrUpdateUser from './components/createOrUpdateUser';
54
import { EntityDto } from 'src/services/dto/entityDto';

0 commit comments

Comments
 (0)