gitadmin/admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev-2.0.0-beta.3

Browse Source
This commit is contained in:
xidedix 2018-04-30 19:44:55 +02:00
commit ae6ebc7e4d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/Dashboard/Dashboard.js
View File

@ -497,8 +497,8 @@ class Dashboard extends Component {
</DropdownMenu> </DropdownMenu>
</ButtonDropdown> </ButtonDropdown>
</ButtonGroup> </ButtonGroup>
<h4 className="mb-0">9.823</h4> <div className="text-value">9.823</div>
<p>Members online</p> <div>Members online</div>
</CardBody> </CardBody>
<div className="chart-wrapper mx-3" style={{ height: '70px' }}> <div className="chart-wrapper mx-3" style={{ height: '70px' }}>
<Line data={cardChartData2} options={cardChartOpts2} height={70} /> <Line data={cardChartData2} options={cardChartOpts2} height={70} />
@ -521,8 +521,8 @@ class Dashboard extends Component {
</DropdownMenu> </DropdownMenu>
</Dropdown> </Dropdown>
</ButtonGroup> </ButtonGroup>
<h4 className="mb-0">9.823</h4> <div className="text-value">9.823</div>
<p>Members online</p> <div>Members online</div>
</CardBody> </CardBody>
<div className="chart-wrapper mx-3" style={{ height: '70px' }}> <div className="chart-wrapper mx-3" style={{ height: '70px' }}>
<Line data={cardChartData1} options={cardChartOpts1} height={70} /> <Line data={cardChartData1} options={cardChartOpts1} height={70} />
@ -545,8 +545,8 @@ class Dashboard extends Component {
</DropdownMenu> </DropdownMenu>
</Dropdown> </Dropdown>
</ButtonGroup> </ButtonGroup>
<h4 className="mb-0">9.823</h4> <div className="text-value">9.823</div>
<p>Members online</p> <div>Members online</div>
</CardBody> </CardBody>
<div className="chart-wrapper" style={{ height: '70px' }}> <div className="chart-wrapper" style={{ height: '70px' }}>
<Line data={cardChartData3} options={cardChartOpts3} height={70} /> <Line data={cardChartData3} options={cardChartOpts3} height={70} />
@ -569,8 +569,8 @@ class Dashboard extends Component {
</DropdownMenu> </DropdownMenu>
</ButtonDropdown> </ButtonDropdown>
</ButtonGroup> </ButtonGroup>
<h4 className="mb-0">9.823</h4> <div className="text-value">9.823</div>
<p>Members online</p> <div>Members online</div>
</CardBody> </CardBody>
<div className="chart-wrapper mx-3" style={{ height: '70px' }}> <div className="chart-wrapper mx-3" style={{ height: '70px' }}>
<Bar data={cardChartData4} options={cardChartOpts4} height={70} /> <Bar data={cardChartData4} options={cardChartOpts4} height={70} />