Merge branch 'master' into dev-2.0.0-beta.3
This commit is contained in:
commit
ae6ebc7e4d
@ -497,8 +497,8 @@ class Dashboard extends Component {
|
||||
</DropdownMenu>
|
||||
</ButtonDropdown>
|
||||
</ButtonGroup>
|
||||
<h4 className="mb-0">9.823</h4>
|
||||
<p>Members online</p>
|
||||
<div className="text-value">9.823</div>
|
||||
<div>Members online</div>
|
||||
</CardBody>
|
||||
<div className="chart-wrapper mx-3" style={{ height: '70px' }}>
|
||||
<Line data={cardChartData2} options={cardChartOpts2} height={70} />
|
||||
@ -521,8 +521,8 @@ class Dashboard extends Component {
|
||||
</DropdownMenu>
|
||||
</Dropdown>
|
||||
</ButtonGroup>
|
||||
<h4 className="mb-0">9.823</h4>
|
||||
<p>Members online</p>
|
||||
<div className="text-value">9.823</div>
|
||||
<div>Members online</div>
|
||||
</CardBody>
|
||||
<div className="chart-wrapper mx-3" style={{ height: '70px' }}>
|
||||
<Line data={cardChartData1} options={cardChartOpts1} height={70} />
|
||||
@ -545,8 +545,8 @@ class Dashboard extends Component {
|
||||
</DropdownMenu>
|
||||
</Dropdown>
|
||||
</ButtonGroup>
|
||||
<h4 className="mb-0">9.823</h4>
|
||||
<p>Members online</p>
|
||||
<div className="text-value">9.823</div>
|
||||
<div>Members online</div>
|
||||
</CardBody>
|
||||
<div className="chart-wrapper" style={{ height: '70px' }}>
|
||||
<Line data={cardChartData3} options={cardChartOpts3} height={70} />
|
||||
@ -569,8 +569,8 @@ class Dashboard extends Component {
|
||||
</DropdownMenu>
|
||||
</ButtonDropdown>
|
||||
</ButtonGroup>
|
||||
<h4 className="mb-0">9.823</h4>
|
||||
<p>Members online</p>
|
||||
<div className="text-value">9.823</div>
|
||||
<div>Members online</div>
|
||||
</CardBody>
|
||||
<div className="chart-wrapper mx-3" style={{ height: '70px' }}>
|
||||
<Bar data={cardChartData4} options={cardChartOpts4} height={70} />
|
||||
|
Loading…
Reference in New Issue
Block a user