Merge remote-tracking branch 'origin/Kane/menu' into finn/CoreUI
This commit is contained in:
piratefinn
commit
65a9a8984b
6 changed files with 50 additions and 128 deletions
|
|
@ -13,8 +13,8 @@
|
|||
<a class="dropdown-item" href="#">Something else here</a>
|
||||
</div>
|
||||
</div>
|
||||
<h4 class="mb-0">9.823</h4>
|
||||
<p>Members online</p>
|
||||
<h4 class="mb-0">£183.98</h4>
|
||||
<p>Money spent this week</p>
|
||||
</div>
|
||||
<div class="chart-wrapper px-3" style="height:70px;">
|
||||
<canvas baseChart class="chart"
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
<i class="icon-location-pin"></i>
|
||||
</button>
|
||||
<h4 class="mb-0">9.823</h4>
|
||||
<p>Members online</p>
|
||||
<p>Money spent last week</p>
|
||||
</div>
|
||||
<div class="chart-wrapper px-3" style="height:70px;">
|
||||
<canvas baseChart class="chart"
|
||||
|
|
@ -65,7 +65,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<h4 class="mb-0">9.823</h4>
|
||||
<p>Members online</p>
|
||||
<p>Points earned this week</p>
|
||||
</div>
|
||||
<div class="chart-wrapper" style="height:70px;">
|
||||
<canvas baseChart class="chart"
|
||||
|
|
@ -94,7 +94,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<h4 class="mb-0">9.823</h4>
|
||||
<p>Members online</p>
|
||||
<p>Points earned last week</p>
|
||||
</div>
|
||||
<div class="chart-wrapper px-3" style="height:70px;">
|
||||
<canvas baseChart class="chart"
|
||||
|
|
@ -114,7 +114,7 @@
|
|||
<div class="card-block">
|
||||
<div class="row">
|
||||
<div class="col-sm-5">
|
||||
<h4 class="card-title mb-0">Traffic</h4>
|
||||
<h4 class="card-title mb-0">Customers</h4>
|
||||
<div class="small text-muted">November 2015</div>
|
||||
</div><!--/.col-->
|
||||
<div class="col-sm-7 hidden-sm-down">
|
||||
|
|
@ -148,15 +148,8 @@
|
|||
</div>
|
||||
<div class="card-footer">
|
||||
<ul>
|
||||
<li>
|
||||
<div class="text-muted">Visits</div>
|
||||
<strong>29.703 Users (40%)</strong>
|
||||
<div class="progress progress-xs mt-2">
|
||||
<div class="progress-bar bg-success" role="progressbar" style="width: 40%" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100"></div>
|
||||
</div>
|
||||
</li>
|
||||
<li class="hidden-sm-down">
|
||||
<div class="text-muted">Unique</div>
|
||||
<div class="text-muted">Customers</div>
|
||||
<strong>24.093 Users (20%)</strong>
|
||||
<div class="progress progress-xs mt-2">
|
||||
<div class="progress-bar bg-info" role="progressbar" style="width: 20%" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100"></div>
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ export class DashboardComponent implements OnInit {
|
|||
// lineChart1
|
||||
public lineChart1Data: Array<any> = [
|
||||
{
|
||||
data: [65, 59, 84, 84, 51, 55, 40],
|
||||
data: [44.72, 29.97, 16.65, 30.99, 47.75, 6.95, 6.95],
|
||||
label: 'Series A'
|
||||
}
|
||||
];
|
||||
|
|
@ -68,8 +68,8 @@ export class DashboardComponent implements OnInit {
|
|||
display: false,
|
||||
ticks: {
|
||||
display: false,
|
||||
min: 40 - 5,
|
||||
max: 84 + 5,
|
||||
min: 5 - 5,
|
||||
max: 50 + 5,
|
||||
}
|
||||
}],
|
||||
},
|
||||
|
|
@ -467,7 +467,7 @@ export class DashboardComponent implements OnInit {
|
|||
for (let i = 0; i <= this.mainChartElements; i++) {
|
||||
this.mainChartData1.push(this.random(50, 200));
|
||||
this.mainChartData2.push(this.random(80, 100));
|
||||
this.mainChartData3.push(65);
|
||||
this.mainChartData3.push(this.random(50, 200));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,15 +16,6 @@
|
|||
</li>
|
||||
</ul>
|
||||
<ul class="nav navbar-nav ml-auto">
|
||||
<li class="nav-item d-md-down-none">
|
||||
<a class="nav-link" href="#"><i class="icon-bell"></i><span class="badge badge-pill badge-danger">5</span></a>
|
||||
</li>
|
||||
<li class="nav-item d-md-down-none">
|
||||
<a class="nav-link" href="#"><i class="icon-list"></i></a>
|
||||
</li>
|
||||
<li class="nav-item d-md-down-none">
|
||||
<a class="nav-link" href="#"><i class="icon-location-pin"></i></a>
|
||||
</li>
|
||||
<li class="nav-item dropdown" dropdown (onToggle)="toggled($event)">
|
||||
<a href class="nav-link dropdown-toggle" dropdownToggle (click)="false">
|
||||
<img src="assets/img/avatars/6.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
|
||||
|
|
@ -41,10 +32,10 @@
|
|||
|
||||
<div class="dropdown-header text-center"><strong>Settings</strong></div>
|
||||
|
||||
<a class="dropdown-item" href="#"><i class="fa fa-user"></i> Profile</a>
|
||||
<a class="dropdown-item" href="#"><i class="fa fa-wrench"></i> Setting</a>
|
||||
<a class="dropdown-item" href="#"><i class="fa fa-usd"></i> Payments<span class="badge badge-default">42</span></a>
|
||||
<a class="dropdown-item" href="#"><i class="fa fa-file"></i> Projects<span class="badge badge-primary">42</span></a>
|
||||
<a class="dropdown-item" href="#"><i class="fa fa-user"></i> User Settings</a>
|
||||
<a class="dropdown-item" href="#"><i class="fa fa-wrench"></i> Transaction History</a>
|
||||
<a class="dropdown-item" href="#"><i class="fa fa-usd"></i> Points History<span class="badge badge-default">42</span></a>
|
||||
<a class="dropdown-item" href="#"><i class="fa fa-file"></i> Notifications<span class="badge badge-primary">42</span></a>
|
||||
<div class="divider"></div>
|
||||
<a class="dropdown-item" href="#"><i class="fa fa-shield"></i> Lock account</a>
|
||||
<a class="dropdown-item" href="#"><i class="fa fa-lock"></i> Logout</a>
|
||||
|
|
@ -147,9 +138,9 @@
|
|||
<!-- Breadcrumb Menu-->
|
||||
<li class="breadcrumb-menu d-md-down-none">
|
||||
<div class="btn-group" role="group" aria-label="Button group with nested dropdown">
|
||||
<a class="btn btn-secondary" href="#"><i class="icon-speech"></i></a>
|
||||
<a class="btn btn-secondary" [routerLink]="['/dashboard']"><i class="icon-graph"></i> Dashboard</a>
|
||||
<a class="btn btn-secondary" href="#"><i class="icon-settings"></i> Settings</a>
|
||||
<a class="btn btn-secondary" [routerLink]="['/dashboard']"> Money Spent this Month: £364.45</a>
|
||||
<a class="btn btn-secondary" href="#">< Add Transaction</a>
|
||||
<a class="btn btn-secondary" href="#"> Points Total: 206</a>
|
||||
</div>
|
||||
</li>
|
||||
</ol>
|
||||
|
|
@ -163,90 +154,24 @@
|
|||
<tabset>
|
||||
<tab>
|
||||
<ng-template tabHeading><i class="icon-list"></i></ng-template>
|
||||
<div class="callout m-0 py-2 text-muted text-center bg-faded text-uppercase">
|
||||
<small><b>Today</b></small>
|
||||
<div class="callout m-0 py-2 text-muted text-center text-uppercase">
|
||||
<small><b><a class="nav-link" href="#">User Settings</a></b></small>
|
||||
</div>
|
||||
<hr class="transparent mx-3 my-0">
|
||||
<div class="callout callout-warning m-0 py-3">
|
||||
<div class="avatar float-right">
|
||||
<img src="assets/img/avatars/7.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
|
||||
</div>
|
||||
<div>Meeting with <strong>Lucas</strong></div>
|
||||
<small class="text-muted mr-3"><i class="icon-calendar"></i> 1 - 3pm</small>
|
||||
<small class="text-muted"><i class="icon-location-pin"></i> Palo Alto, CA </small>
|
||||
</div>
|
||||
<hr class="mx-3 my-0">
|
||||
<div class="callout callout-info m-0 py-3">
|
||||
<div class="avatar float-right">
|
||||
<img src="assets/img/avatars/4.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
|
||||
</div>
|
||||
<div>Skype with <strong>Megan</strong></div>
|
||||
<small class="text-muted mr-3"><i class="icon-calendar"></i> 4 - 5pm</small>
|
||||
<small class="text-muted"><i class="icon-social-skype"></i> On-line </small>
|
||||
<div class="callout m-0 py-2 text-muted text-center text-uppercase">
|
||||
<small><b><a class="nav-link" href="#">Transaction History</a></b></small>
|
||||
</div>
|
||||
<hr class="transparent mx-3 my-0">
|
||||
<div class="callout m-0 py-2 text-muted text-center bg-faded text-uppercase">
|
||||
<small><b>Tomorrow</b></small>
|
||||
<div class="callout m-0 py-2 text-muted text-center text-uppercase">
|
||||
<small><b><a class="nav-link" href="#">Points History</a></b></small>
|
||||
</div>
|
||||
<hr class="transparent mx-3 my-0">
|
||||
<div class="callout callout-danger m-0 py-3">
|
||||
<div>New UI Project - <strong>deadline</strong></div>
|
||||
<small class="text-muted mr-3"><i class="icon-calendar"></i> 10 - 11pm</small>
|
||||
<small class="text-muted"><i class="icon-home"></i> creativeLabs HQ </small>
|
||||
<div class="avatars-stack mt-2">
|
||||
<div class="avatar avatar-xs">
|
||||
<img src="assets/img/avatars/2.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
|
||||
</div>
|
||||
<div class="avatar avatar-xs">
|
||||
<img src="assets/img/avatars/3.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
|
||||
</div>
|
||||
<div class="avatar avatar-xs">
|
||||
<img src="assets/img/avatars/4.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
|
||||
</div>
|
||||
<div class="avatar avatar-xs">
|
||||
<img src="assets/img/avatars/5.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
|
||||
</div>
|
||||
<div class="avatar avatar-xs">
|
||||
<img src="assets/img/avatars/6.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
|
||||
</div>
|
||||
</div>
|
||||
<div class="callout m-0 py-2 text-muted text-center text-uppercase">
|
||||
<small><b><a class="nav-link" href="#">Notifications</a></b></small>
|
||||
</div>
|
||||
<hr class="mx-3 my-0">
|
||||
<div class="callout callout-success m-0 py-3">
|
||||
<div><strong>#10 Startups.Garden</strong> Meetup</div>
|
||||
<small class="text-muted mr-3"><i class="icon-calendar"></i> 1 - 3pm</small>
|
||||
<small class="text-muted"><i class="icon-location-pin"></i> Palo Alto, CA </small>
|
||||
</div>
|
||||
<hr class="mx-3 my-0">
|
||||
<div class="callout callout-primary m-0 py-3">
|
||||
<div><strong>Team meeting</strong></div>
|
||||
<small class="text-muted mr-3"><i class="icon-calendar"></i> 4 - 6pm</small>
|
||||
<small class="text-muted"><i class="icon-home"></i> creativeLabs HQ </small>
|
||||
<div class="avatars-stack mt-2">
|
||||
<div class="avatar avatar-xs">
|
||||
<img src="assets/img/avatars/2.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
|
||||
</div>
|
||||
<div class="avatar avatar-xs">
|
||||
<img src="assets/img/avatars/3.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
|
||||
</div>
|
||||
<div class="avatar avatar-xs">
|
||||
<img src="assets/img/avatars/4.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
|
||||
</div>
|
||||
<div class="avatar avatar-xs">
|
||||
<img src="assets/img/avatars/5.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
|
||||
</div>
|
||||
<div class="avatar avatar-xs">
|
||||
<img src="assets/img/avatars/6.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
|
||||
</div>
|
||||
<div class="avatar avatar-xs">
|
||||
<img src="assets/img/avatars/7.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
|
||||
</div>
|
||||
<div class="avatar avatar-xs">
|
||||
<img src="assets/img/avatars/8.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<hr class="mx-3 my-0">
|
||||
|
||||
|
||||
|
||||
</tab>
|
||||
<tab>
|
||||
<ng-template tabHeading><i class="icon-speech"></i></ng-template>
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@
|
|||
<div class="card">
|
||||
<div class="card-header card-header-inverse card-header-primary">
|
||||
<div class="font-weight-bold">
|
||||
<span>SALE</span>
|
||||
<span>Money spent this week</span>
|
||||
<span class="float-right">$1.890,65</span>
|
||||
</div>
|
||||
<div>
|
||||
|
|
@ -155,7 +155,7 @@
|
|||
<div class="card">
|
||||
<div class="card-header card-header-inverse card-header-danger">
|
||||
<div class="font-weight-bold">
|
||||
<span>SALE</span>
|
||||
<span>Money spent last week</span>
|
||||
<span class="float-right">$1.890,65</span>
|
||||
</div>
|
||||
<div>
|
||||
|
|
@ -168,23 +168,23 @@
|
|||
</div>
|
||||
<div class="chart-wrapper" style="height:38px;">
|
||||
<canvas baseChart class="chart"
|
||||
[datasets]="lineChart4Data"
|
||||
[labels]="lineChart4Labels"
|
||||
[options]="lineChart4Options"
|
||||
[datasets]="lineChart5Data"
|
||||
[labels]="lineChart5Labels"
|
||||
[options]="lineChart5Options"
|
||||
[colors]="lineChart4Colours"
|
||||
[legend]="lineChart4Legend"
|
||||
[chartType]="lineChart4Type"
|
||||
[legend]="lineChart5Legend"
|
||||
[chartType]="lineChart5Type"
|
||||
(chartHover)="chartHovered($event)"
|
||||
(chartClick)="chartClicked($event)"></canvas>
|
||||
</div>
|
||||
<div class="chart-wrapper" style="height:38px;">
|
||||
<canvas baseChart class="chart"
|
||||
[datasets]="barChart2Data"
|
||||
[labels]="barChart2Labels"
|
||||
[options]="barChart2Options"
|
||||
[datasets]="barChart3Data"
|
||||
[labels]="barChart3Labels"
|
||||
[options]="barChart3Options"
|
||||
[colors]="barChart2Colours"
|
||||
[legend]="barChart2Legend"
|
||||
[chartType]="barChart2Type"
|
||||
[legend]="barChart3Legend"
|
||||
[chartType]="barChart3Type"
|
||||
(chartHover)="chartHovered($event)"
|
||||
(chartClick)="chartClicked($event)"></canvas>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ export class WidgetsComponent {
|
|||
// lineChart1
|
||||
public lineChart1Data: Array<any> = [
|
||||
{
|
||||
data: [65, 59, 84, 84, 51, 55, 40],
|
||||
data: [80, 59, 84, 84, 51, 55, 40],
|
||||
label: 'Series A'
|
||||
}
|
||||
];
|
||||
|
|
@ -220,11 +220,11 @@ export class WidgetsComponent {
|
|||
// lineChart4
|
||||
public lineChart4Data: Array<any> = [
|
||||
{
|
||||
data: [4, 18, 9, 17, 34, 22, 11, 3, 15, 12, 18, 9],
|
||||
data: [4, 18, 9, 17, 80, 22, 11],
|
||||
label: 'Series A'
|
||||
}
|
||||
];
|
||||
public lineChart4Labels: Array<any> = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
|
||||
public lineChart4Labels: Array<any> = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'];
|
||||
public lineChart4Options: any = {
|
||||
maintainAspectRatio: false,
|
||||
scales: {
|
||||
|
|
@ -259,7 +259,7 @@ export class WidgetsComponent {
|
|||
label: 'Series A'
|
||||
}
|
||||
];
|
||||
public barChart2Labels: Array<any> = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
|
||||
public barChart2Labels: Array<any> = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'];
|
||||
public barChart2Options: any = {
|
||||
maintainAspectRatio: false,
|
||||
scales: {
|
||||
|
|
@ -338,7 +338,7 @@ export class WidgetsComponent {
|
|||
// lineChart5
|
||||
public lineChart5Data: Array<any> = [
|
||||
{
|
||||
data: [65, 59, 84, 84, 51, 55, 40],
|
||||
data: [4, 18, 9, 17, 34, 22, 11, 3, 15, 12, 18, 9],
|
||||
label: 'Series A'
|
||||
}
|
||||
];
|
||||
|
|
|
|||
|
|
@ -15,6 +15,10 @@
|
|||
.btn.btn-secondary {
|
||||
color: $text-muted;
|
||||
border: 0;
|
||||
display: block;
|
||||
float: center;
|
||||
position: relative;
|
||||
width: 100%;
|
||||
|
||||
&:hover, &.active {
|
||||
color: $body-color;
|
||||
|
|
|
|||
Reference in a new issue